bug fix for issue #609

alibaba · Aug 12, 2022 · 353f70c · 353f70c
1 parent 7ee4f1d
commit 353f70c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderASCII.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderASCII.java
@@ -182,7 +182,7 @@ public long readFieldNameHashCode() {
                     c = (char) bytes[offset];
                 }
                 if (c != ':') {
-                    return -1;
+                    throw new JSONException(info("expect ':', but " + c));
                 }
 
                 offset++;

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java
@@ -845,7 +845,7 @@ public long readFieldNameHashCode() {
                     ch = EOI;
                 }
                 if (c != ':') {
-                    return -1;
+                    throw new JSONException(info("expect ':', but " + c));
                 }
 
                 offset++;

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
@@ -427,7 +427,8 @@ public long readFieldNameHashCode() {
                     c = bytes[offset];
                 }
                 if (c != ':') {
-                    return -1;
+                    // return -1;
+                    throw new JSONException(info("expect ':', but " + c));
                 }
 
                 offset++;

diff --git a/core/src/test/java/com/alibaba/fastjson2/JSONReaderStr.java b/core/src/test/java/com/alibaba/fastjson2/JSONReaderStr.java
@@ -489,7 +489,7 @@ public long readFieldNameHashCode() {
                     ch = EOI;
                 }
                 if (c != ':') {
-                    return -1;
+                    throw new JSONException(info("expect ':', but " + c));
                 }
 
                 offset++;

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues/Issue669.java b/core/src/test/java/com/alibaba/fastjson2/issues/Issue669.java
@@ -0,0 +1,23 @@
+package com.alibaba.fastjson2.issues;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONException;
+import lombok.Data;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class Issue669 {
+    @Test
+    public void test() {
+        assertThrows(
+                JSONException.class,
+                () -> JSON.parseArray("[\"3330354\"]", Bean.class)
+        );
+    }
+
+    @Data
+    public static class Bean {
+        private String a;
+    }
+}