From 9a6f1f2dc9661bf77bd5c64529add77d8ca443c3 Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Wed, 25 Sep 2019 01:53:47 -0400
Subject: [PATCH] Simplify unpackString (#1012)

---
 msg_helpers.go | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/msg_helpers.go b/msg_helpers.go
index 66674339..0e96f0f3 100644
--- a/msg_helpers.go
+++ b/msg_helpers.go
@@ -269,33 +269,32 @@ func unpackString(msg []byte, off int) (string, int, error) {
 	if off+l > len(msg) {
 		return "", off, &Error{err: "overflow unpacking txt"}
 	}
-	escapedLen := l
-	for _, b := range msg[off : off+l] {
-		switch {
-		case b == '"' || b == '\\':
-			escapedLen++
-		case b < ' ' || b > '~': // unprintable
-			escapedLen += 3 // escapeByte always returns four characters
-		}
-	}
-	if escapedLen == l { // no escaping needed
-		return string(msg[off : off+l]), off + l, nil
-	}
 	var s strings.Builder
-	s.Grow(escapedLen)
-	for _, b := range msg[off : off+l] {
+	consumed := 0
+	for i, b := range msg[off : off+l] {
 		switch {
 		case b == '"' || b == '\\':
+			if consumed == 0 {
+				s.Grow(l * 2)
+			}
+			s.Write(msg[off+consumed : off+i])
 			s.WriteByte('\\')
 			s.WriteByte(b)
+			consumed = i + 1
 		case b < ' ' || b > '~': // unprintable
+			if consumed == 0 {
+				s.Grow(l * 2)
+			}
+			s.Write(msg[off+consumed : off+i])
 			s.WriteString(escapeByte(b))
-		default:
-			s.WriteByte(b)
+			consumed = i + 1
 		}
 	}
-	off += l
-	return s.String(), off, nil
+	if consumed == 0 { // no escaping needed
+		return string(msg[off : off+l]), off + l, nil
+	}
+	s.Write(msg[off+consumed : off+l])
+	return s.String(), off + l, nil
 }
 
 func packString(s string, msg []byte, off int) (int, error) {