Merge pull request #253 from IncSW/fix-251

fix error when unmarshal empty array
goccy · Jun 17, 2021 · 2565e47 · 2565e47
2 parents faa4de9 + 94cecc0
commit 2565e47
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/decode_test.go b/decode_test.go
@@ -3666,3 +3666,26 @@ func TestDecodeContextOption(t *testing.T) {
 		}
 	})
 }
+
+func TestIssue251(t *testing.T) {
+	array := [3]int{1, 2, 3}
+	err := stdjson.Unmarshal([]byte("[ ]"), &array)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(array)
+
+	array = [3]int{1, 2, 3}
+	err = json.Unmarshal([]byte("[ ]"), &array)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(array)
+
+	array = [3]int{1, 2, 3}
+	err = json.NewDecoder(strings.NewReader(`[ ]`)).Decode(&array)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(array)
+}
diff --git a/internal/decoder/array.go b/internal/decoder/array.go
@@ -46,8 +46,16 @@ func (d *arrayDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) er
 			return nil
 		case '[':
 			idx := 0
-			for {
+			s.cursor++
+			if s.skipWhiteSpace() == ']' {
+				for idx < d.alen {
+					*(*unsafe.Pointer)(unsafe.Pointer(uintptr(p) + uintptr(idx)*d.size)) = d.zeroValue
+					idx++
+				}
 				s.cursor++
+				return nil
+			}
+			for {
 				if idx < d.alen {
 					if err := d.valueDecoder.DecodeStream(s, depth, unsafe.Pointer(uintptr(p)+uintptr(idx)*d.size)); err != nil {
 						return err
@@ -67,9 +75,11 @@ func (d *arrayDecoder) DecodeStream(s *Stream, depth int64, p unsafe.Pointer) er
 					s.cursor++
 					return nil
 				case ',':
+					s.cursor++
 					continue
 				case nul:
 					if s.read() {
+						s.cursor++
 						continue
 					}
 					goto ERROR
@@ -111,8 +121,17 @@ func (d *arrayDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 			return cursor, nil
 		case '[':
 			idx := 0
-			for {
+			cursor++
+			cursor = skipWhiteSpace(buf, cursor)
+			if buf[cursor] == ']' {
+				for idx < d.alen {
+					*(*unsafe.Pointer)(unsafe.Pointer(uintptr(p) + uintptr(idx)*d.size)) = d.zeroValue
+					idx++
+				}
 				cursor++
+				return cursor, nil
+			}
+			for {
 				if idx < d.alen {
 					c, err := d.valueDecoder.Decode(ctx, cursor, depth, unsafe.Pointer(uintptr(p)+uintptr(idx)*d.size))
 					if err != nil {
@@ -137,6 +156,7 @@ func (d *arrayDecoder) Decode(ctx *RuntimeContext, cursor, depth int64, p unsafe
 					cursor++
 					return cursor, nil
 				case ',':
+					cursor++
 					continue
 				default:
 					return 0, errors.ErrInvalidCharacter(buf[cursor], "array", cursor)