Fix streaming decoder

doytsujin · Feb 6, 2021 · c5234b8 · c5234b8
1 parent e0b010d
commit c5234b8
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/decode_struct.go b/decode_struct.go
@@ -331,6 +331,11 @@ func decodeKeyByBitmapInt8Stream(d *structDecoder, s *stream) (*structFieldSet,
 		switch s.char() {
 		case ' ', '\n', '\t', '\r':
 			s.cursor++
+		case nul:
+			if s.read() {
+				continue
+			}
+			return nil, "", errNotAtBeginningOfValue(s.totalOffset())
 		case '"':
 			s.cursor++
 		FIRST_CHAR:
@@ -434,6 +439,11 @@ func decodeKeyByBitmapInt16Stream(d *structDecoder, s *stream) (*structFieldSet,
 		switch s.char() {
 		case ' ', '\n', '\t', '\r':
 			s.cursor++
+		case nul:
+			if s.read() {
+				continue
+			}
+			return nil, "", errNotAtBeginningOfValue(s.totalOffset())
 		case '"':
 			s.cursor++
 		FIRST_CHAR:
@@ -585,9 +595,6 @@ func (d *structDecoder) decodeStream(s *stream, p unsafe.Pointer) error {
 			}
 		}
 		s.skipWhiteSpace()
-		if s.char() == nul {
-			s.read()
-		}
 		c := s.char()
 		if c == '}' {
 			s.cursor++