Merge pull request #152 from jRiest/fix-quote-encoding

Escape quotation marks in text encoding
capnproto · May 13, 2021 · 186651b · 186651b
2 parents a475cf2 + 9fd01b2
commit 186651b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -22,6 +22,7 @@ Dominik Roos <[email protected]>
 Eran Duchan <[email protected]>
 Evan Shaw <[email protected]>
 Ian Denhardt <[email protected]>
+Jake Riesterer <[email protected]>
 James McKaskill <[email protected]>
 Jason E. Aten <[email protected]>
 Johan Hernandez <[email protected]>

diff --git a/encoding/text/marshal_test.go b/encoding/text/marshal_test.go
@@ -59,8 +59,8 @@ func TestEncode(t *testing.T) {
 		{0x81fdbfdc91779421, `(map = [])`, `(
     map = []
 )`},
-		{0x8e85252144f61858, `(data = "Hi\xde\xad\xbe\xef\xca\xfe")`, `(
-    data = "Hi\xde\xad\xbe\xef\xca\xfe"
+		{0x8e85252144f61858, `(data = "Hi\xde\xad\xbe\xef\xca\xfe\"\'\\")`, `(
+    data = "Hi\xde\xad\xbe\xef\xca\xfe\"\'\\"
 )`},
 		{0xc21398a8474837ba, `(voidList = [void, void])`, `(
     voidList = [

diff --git a/encoding/text/testdata/txt.capnp b/encoding/text/testdata/txt.capnp
@@ -55,7 +55,7 @@ const mapVal @0xb167974479102805 :Value = (map = [
   (key = "foo", value = (void = void)),
   (key = "bar", value = (void = void)),
 ]);
-const data @0x8e85252144f61858 :Value = (data = 0x"4869 dead beef cafe");
+const data @0x8e85252144f61858 :Value = (data = 0x"4869 dead beef cafe 22275c");
 const emptyMap @0x81fdbfdc91779421 :Value = (map = []);
 const voidList @0xc21398a8474837ba :Value = (voidList = [void, void]);
 const boolList @0xde82c2eeb3a4b07c :Value = (boolList = [true, false, true, false]);

diff --git a/encoding/text/testdata/txt.capnp.out b/encoding/text/testdata/txt.capnp.out
diff --git a/internal/strquote/strquote.go b/internal/strquote/strquote.go
@@ -43,7 +43,7 @@ func Append(buf []byte, s []byte) []byte {
 }
 
 func needsEscape(b byte) bool {
-	return b < 0x20 || b >= 0x7f
+	return b < 0x20 || b >= 0x7f || b == '\'' || b == '"' || b == '\\'
 }
 
 func hexDigit(b byte) byte {