Merge pull request #383 from KimHyeonwoo/master

Fix unexpected behavior when buffer ends with backslash
goccy · Aug 3, 2022 · 4cf345e · 4cf345e
2 parents a75c1c6 + f83142d
commit 4cf345e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/decode_test.go b/decode_test.go
@@ -3985,3 +3985,23 @@ func TestIssue372(t *testing.T) {
 		t.Errorf("unexpected result: %v != %v", got, expected)
 	}
 }
+
+type issue384 struct{}
+
+func (t *issue384) UnmarshalJSON(b []byte) error {
+	return nil
+}
+
+func TestIssue384(t *testing.T) {
+	testcases := []string{
+		`{"data": "` + strings.Repeat("-", 500) + `\""}`,
+		`["` + strings.Repeat("-", 508) + `\""]`,
+	}
+	for _, tc := range testcases {
+		dec := json.NewDecoder(strings.NewReader(tc))
+		var v issue384
+		if err := dec.Decode(&v); err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+	}
+}
diff --git a/internal/decoder/stream.go b/internal/decoder/stream.go
@@ -280,7 +280,7 @@ func (s *Stream) skipObject(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.statForRetry()
+							_, cursor, p = s.stat()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("string of object", cursor)
@@ -343,7 +343,7 @@ func (s *Stream) skipArray(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.statForRetry()
+							_, cursor, p = s.stat()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("string of object", cursor)
@@ -401,7 +401,7 @@ func (s *Stream) skipValue(depth int64) error {
 					if char(p, cursor) == nul {
 						s.cursor = cursor
 						if s.read() {
-							_, cursor, p = s.statForRetry()
+							_, cursor, p = s.stat()
 							continue
 						}
 						return errors.ErrUnexpectedEndOfJSON("value of string", s.totalOffset())