You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2016/03/11 23:24:55 UTC
thrift git commit: THRIFT-3735 JSON protocol left in incorrect state
when an exception is thrown during read or write operations Client: Go Patch:
Tyler Treat
Repository: thrift
Updated Branches:
refs/heads/master f5399b2f5 -> 5025a302c
THRIFT-3735 JSON protocol left in incorrect state when an exception is thrown during read or write operations
Client: Go
Patch: Tyler Treat <ty...@webfilings.com>
This closes #943
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5025a302
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5025a302
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5025a302
Branch: refs/heads/master
Commit: 5025a302c6dd877ff045f3db729805f76c785675
Parents: f5399b2
Author: Tyler Treat <ty...@webfilings.com>
Authored: Fri Mar 11 15:15:17 2016 -0600
Committer: Jens Geyer <je...@apache.org>
Committed: Fri Mar 11 23:23:50 2016 +0100
----------------------------------------------------------------------
lib/go/thrift/json_protocol.go | 7 ++++--
lib/go/thrift/simple_json_protocol.go | 37 ++++++++++++++++++++++--------
2 files changed, 32 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5025a302/lib/go/thrift/json_protocol.go
----------------------------------------------------------------------
diff --git a/lib/go/thrift/json_protocol.go b/lib/go/thrift/json_protocol.go
index ec549b7..442fa91 100644
--- a/lib/go/thrift/json_protocol.go
+++ b/lib/go/thrift/json_protocol.go
@@ -60,6 +60,7 @@ func NewTJSONProtocolFactory() *TJSONProtocolFactory {
}
func (p *TJSONProtocol) WriteMessageBegin(name string, typeId TMessageType, seqId int32) error {
+ p.resetContextStack() // THRIFT-3735
if e := p.OutputListBegin(); e != nil {
return e
}
@@ -202,17 +203,18 @@ func (p *TJSONProtocol) WriteBinary(v []byte) error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
writer := base64.NewEncoder(base64.StdEncoding, p.writer)
if _, e := writer.Write(v); e != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
return NewTProtocolException(e)
}
if e := writer.Close(); e != nil {
return NewTProtocolException(e)
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -220,6 +222,7 @@ func (p *TJSONProtocol) WriteBinary(v []byte) error {
// Reading methods.
func (p *TJSONProtocol) ReadMessageBegin() (name string, typeId TMessageType, seqId int32, err error) {
+ p.resetContextStack() // THRIFT-3735
if isNull, err := p.ParseListBegin(); isNull || err != nil {
return name, typeId, seqId, err
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/5025a302/lib/go/thrift/simple_json_protocol.go
----------------------------------------------------------------------
diff --git a/lib/go/thrift/simple_json_protocol.go b/lib/go/thrift/simple_json_protocol.go
index e739be9..7353322 100644
--- a/lib/go/thrift/simple_json_protocol.go
+++ b/lib/go/thrift/simple_json_protocol.go
@@ -156,6 +156,7 @@ func mismatch(expected, actual string) error {
}
func (p *TSimpleJSONProtocol) WriteMessageBegin(name string, typeId TMessageType, seqId int32) error {
+ p.resetContextStack() // THRIFT-3735
if e := p.OutputListBegin(); e != nil {
return e
}
@@ -269,17 +270,18 @@ func (p *TSimpleJSONProtocol) WriteBinary(v []byte) error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
writer := base64.NewEncoder(base64.StdEncoding, p.writer)
if _, e := writer.Write(v); e != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
return NewTProtocolException(e)
}
if e := writer.Close(); e != nil {
return NewTProtocolException(e)
}
- if _, e := p.writer.Write(JSON_QUOTE_BYTES); e != nil {
+ if _, e := p.write(JSON_QUOTE_BYTES); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -287,6 +289,7 @@ func (p *TSimpleJSONProtocol) WriteBinary(v []byte) error {
// Reading methods.
func (p *TSimpleJSONProtocol) ReadMessageBegin() (name string, typeId TMessageType, seqId int32, err error) {
+ p.resetContextStack() // THRIFT-3735
if isNull, err := p.ParseListBegin(); isNull || err != nil {
return name, typeId, seqId, err
}
@@ -565,12 +568,12 @@ func (p *TSimpleJSONProtocol) OutputPreValue() error {
cxt := _ParseContext(p.dumpContext[len(p.dumpContext)-1])
switch cxt {
case _CONTEXT_IN_LIST, _CONTEXT_IN_OBJECT_NEXT_KEY:
- if _, e := p.writer.Write(JSON_COMMA); e != nil {
+ if _, e := p.write(JSON_COMMA); e != nil {
return NewTProtocolException(e)
}
break
case _CONTEXT_IN_OBJECT_NEXT_VALUE:
- if _, e := p.writer.Write(JSON_COLON); e != nil {
+ if _, e := p.write(JSON_COLON); e != nil {
return NewTProtocolException(e)
}
break
@@ -626,7 +629,7 @@ func (p *TSimpleJSONProtocol) OutputNull() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_NULL); e != nil {
+ if _, e := p.write(JSON_NULL); e != nil {
return NewTProtocolException(e)
}
return p.OutputPostValue()
@@ -684,7 +687,7 @@ func (p *TSimpleJSONProtocol) OutputString(s string) error {
}
func (p *TSimpleJSONProtocol) OutputStringData(s string) error {
- _, e := p.writer.Write([]byte(s))
+ _, e := p.write([]byte(s))
return NewTProtocolException(e)
}
@@ -692,7 +695,7 @@ func (p *TSimpleJSONProtocol) OutputObjectBegin() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_LBRACE); e != nil {
+ if _, e := p.write(JSON_LBRACE); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = append(p.dumpContext, int(_CONTEXT_IN_OBJECT_FIRST))
@@ -700,7 +703,7 @@ func (p *TSimpleJSONProtocol) OutputObjectBegin() error {
}
func (p *TSimpleJSONProtocol) OutputObjectEnd() error {
- if _, e := p.writer.Write(JSON_RBRACE); e != nil {
+ if _, e := p.write(JSON_RBRACE); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = p.dumpContext[:len(p.dumpContext)-1]
@@ -714,7 +717,7 @@ func (p *TSimpleJSONProtocol) OutputListBegin() error {
if e := p.OutputPreValue(); e != nil {
return e
}
- if _, e := p.writer.Write(JSON_LBRACKET); e != nil {
+ if _, e := p.write(JSON_LBRACKET); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = append(p.dumpContext, int(_CONTEXT_IN_LIST_FIRST))
@@ -722,7 +725,7 @@ func (p *TSimpleJSONProtocol) OutputListBegin() error {
}
func (p *TSimpleJSONProtocol) OutputListEnd() error {
- if _, e := p.writer.Write(JSON_RBRACKET); e != nil {
+ if _, e := p.write(JSON_RBRACKET); e != nil {
return NewTProtocolException(e)
}
p.dumpContext = p.dumpContext[:len(p.dumpContext)-1]
@@ -1318,3 +1321,17 @@ func (p *TSimpleJSONProtocol) safePeekContains(b []byte) bool {
}
return true
}
+
+// Reset the context stack to its initial state.
+func (p *TSimpleJSONProtocol) resetContextStack() {
+ p.parseContextStack = []int{int(_CONTEXT_IN_TOPLEVEL)}
+ p.dumpContext = []int{int(_CONTEXT_IN_TOPLEVEL)}
+}
+
+func (p *TSimpleJSONProtocol) write(b []byte) (int, error) {
+ n, err := p.writer.Write(b)
+ if err != nil {
+ p.writer.Reset(p.trans) // THRIFT-3735
+ }
+ return n, err
+}