From 9fd01b2800d3a08dde2c0047635c50dc020885ab Mon Sep 17 00:00:00 2001
From: Jake Riesterer <jriesterer@cloudflare.com>
Date: Fri, 7 Feb 2020 18:39:52 -0600
Subject: [PATCH] Escape quotation marks in text encoding

The switch statement [here](https://github.com/capnproto/go-capnproto2/blob/503c1bb7bbe95734920325b8999cc89b8b79fcfa/internal/strquote/strquote.go#L29-L34) is attempting to escape quotation marks, but since `needsEscape` didn't return `true` for quotation marks, they never made it into the switch statement, and therefore weren't getting escaped.
---
 CONTRIBUTORS                         |   1 +
 encoding/text/marshal_test.go        |   4 ++--
 encoding/text/testdata/txt.capnp     |   2 +-
 encoding/text/testdata/txt.capnp.out | Bin 10696 -> 11808 bytes
 internal/strquote/strquote.go        |   2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9a1aa311..7c27b36f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -22,6 +22,7 @@ Dominik Roos <domi.roos@gmail.com>
 Eran Duchan <pavius@gmail.com>
 Evan Shaw <edsrzf@gmail.com>
 Ian Denhardt <ian@zenhack.net>
+Jake Riesterer <jriesterer@cloudflare.com>
 James McKaskill <james@foobar.co.nz>
 Jason E. Aten <j.e.aten@gmail.com>
 Johan Hernandez <im@bithavoc.io>
diff --git a/encoding/text/marshal_test.go b/encoding/text/marshal_test.go
index 992a520d..f2198e67 100644
--- 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
index eae50187..6c0aeb73 100644
--- 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
index fd5d3cdf9771a1462ed132b0b73318f428887bf0..0a25a184f4539d7612d127a12ed2c9f657ce30b0 100644
GIT binary patch
literal 11808
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

delta 2195
zcmZ9O4@}f$7{`A<?%@8A6Hbr|f#2_rvja0F!#LC0iLF4>gqB;(+MRIP;Q==|5Qs`x
zEhSCv-lmSZyg6#h<|bX!#`<GcTVjjLTDATh2kGV<CAqnYV)Z<~_r1Fx@4LbCKJWMW
zJkRs~;WxtDzj>}&6kuotp+cFUgF_=MfZsQCg3xUcgoH$GhGMpZo-Skvnbj4M4IkGW
zGm;Te3i`FHhe5ci5d>h9BM!a>(oBO*OQsWqw#?TLd4mV8De#)VK<x+S7Dvx8dXA$H
z#GW6n-2Ch$rDs7M1X_g6sB0sIwe_&Bu00j{ai`DW`-jrGpdww!(Pr?GwsG_;#dqKS
zZFs7e(rZA)&ewDFI!0G<^xA0S72TIlg(&?ZsCa4~j&?EH$I<V%+oSt8X(E(v2lWKd
zuX1!Jqu=1@cP7jYMb|D4Q2I?!vGao*y^qmD96fjLSbo3B6s7b<P_g#+9Q`e$f8pq}
zmm8-KFR7fP^dF4A%F%H~PjmEWMb*<Mk1o1E>06-Ujostu+l<zx&%bZWyL*Dae}0eM
zm<TG;2C(Yaf)w6&7DulgYW=#*?)t$PJSEB5Aoc;A%fYy=gKQ-FpjkAMY>oY4Je|a!
z4@`v*ng1)d{#N)UX~m`06Gmc5m&tz3N<(@{R@ak9c8wTGZ-(rE9GGT`S(qy0CiC;t
z=9lUHx$Kep$K(ClV2!k3l!=$ol9A=bhP!75@}>^;9Hu8(3vFZaR%Tglp^y2)-1?Tm
zy7wl_&z`6B9j2Nx=C@#F{zh*7#4>x=7ytb^OX)$Tj&f0B%)iO4_naAu{C%M>M(I^>
z*w}e3vx&}kFu$K$-*(A!>ZkbhM@I63C>4$|^*R@I2mN5pBEtu+^Pkpza{Hi>h!DO}
zPm47&n<&<eK7?xmodF`1EFs@Xt4LhdlYtUB2i8{9yZz1n$Le49c-lM&k*}n6WX7%*
z8{7f+Gv2lU6P<RaiVS!<11fRv16x&MlRMDr?M$YXOSdY0jN4LuIG2{GfOc<lz@em5
z`oKoRHd#tFy1RoGOY9GKEt2DlEo5JAS!kJGm20Q3#Z6nIx#ksuI**p83e6NdRAfhs
zw?VZh?80F+s{%Yt{y^7ex1XJe(xydTm}+yI+t==ij2lJWLU`B8GianXGLgOBNW!Hh
z#981}ZX#^SB2LqNrfvvGWxzuxF-u*@l9N{nN|iTu`m-Bj|Kf|nZz4pJl~NwLZYv_u
zQklrs9MU6|lPrrihw1EYo7{eAhs13zGE=%21M+LtrC^Q&6YmluPw2bT?#Fouep2ly
zhq<YPOxo<pa=s!xnJZep7^87_sp#Dua56EARTZjqmXBYxR9Nz|VHNjET*WpnWJgPj
zFLC3f+4>r{w++g>g}s?|*hK~88858P#5pTPju+(Rraq(aT9lpcfyi?Ovv?Zh%0p%w
So(TLip?q$W4T7H-Nc|5tiM;m!

diff --git a/internal/strquote/strquote.go b/internal/strquote/strquote.go
index f6af09b9..b8d872d9 100644
--- 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 {