fix(thrift): return err if sz < 0 for str/bin

cloudwego · Nov 5, 2024 · 4b9ff07 · 4b9ff07
1 parent cb56ecb
commit 4b9ff07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/protocol/thrift/binary.go b/protocol/thrift/binary.go
@@ -323,6 +323,9 @@ func (p BinaryProtocol) ReadBinary(buf []byte) (b []byte, l int, err error) {
 	if err != nil {
 		return nil, 0, errReadBin
 	}
+	if sz < 0 {
+		return nil, 0, errNegativeSize
+	}
 	l = 4 + int(sz)
 	if len(buf) < l {
 		return nil, 4, errReadBin
@@ -340,6 +343,9 @@ func (p BinaryProtocol) ReadString(buf []byte) (s string, l int, err error) {
 	if err != nil {
 		return "", 0, errReadStr
 	}
+	if sz < 0 {
+		return "", 0, errNegativeSize
+	}
 	l = 4 + int(sz)
 	if len(buf) < l {
 		return "", 4, errReadStr

diff --git a/protocol/thrift/bufferreader.go b/protocol/thrift/bufferreader.go
@@ -148,6 +148,9 @@ func (r *BufferReader) ReadBinary() (b []byte, err error) {
 	if err != nil {
 		return nil, err
 	}
+	if sz < 0 {
+		return nil, errNegativeSize
+	}
 	b = dirtmake.Bytes(int(sz), int(sz))
 	_, err = r.readBinary(b)
 	return