bug fix for valid, fix #87

alibaba · Apr 26, 2022 · 9ea4d39 · 9ea4d39
1 parent 12cfe67
commit 9ea4d39
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 1 deletion.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderStr.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderStr.java
@@ -989,6 +989,8 @@ protected void skipString() {
         }
 
         if (ch == ',') {
+            comma = true;
+
             if (offset >= end) {
                 ch = EOI;
                 return;
@@ -1320,11 +1322,16 @@ public void skipValue() {
         switch (ch) {
             case '[': {
                 next();
-                for (; ; ) {
+                for (int i = 0; ; ++i) {
                     if (ch == ']') {
                         next();
                         break;
                     }
+
+                    if (i != 0 && !comma) {
+                        throw new JSONValidException("offset " + this.offset);
+                    }
+                    comma = false;
                     skipValue();
                 }
                 break;
@@ -1391,6 +1398,8 @@ public void skipValue() {
         }
 
         if (ch == ',') {
+            comma = true;
+
             if (offset >= length) {
                 ch = EOI;
                 return;

diff --git a/core/src/test/java/com/alibaba/fastjson2/JSONReaderUtils.java b/core/src/test/java/com/alibaba/fastjson2/JSONReaderUtils.java
@@ -0,0 +1,7 @@
+package com.alibaba.fastjson2;
+
+public class JSONReaderUtils {
+    public static JSONReader createJSONReader(String str) {
+        return new JSONReaderStr(JSONFactory.createReadContext(), str, 0, str.length());
+    }
+}
diff --git a/core/src/test/java/com/alibaba/fastjson2/issues/Issue87.java b/core/src/test/java/com/alibaba/fastjson2/issues/Issue87.java
@@ -1,6 +1,9 @@
 package com.alibaba.fastjson2.issues;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONException;
+import com.alibaba.fastjson2.JSONReader;
+import com.alibaba.fastjson2.JSONReaderUtils;
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -26,6 +29,37 @@ public void valid_1() {
                 JSON.isValid(errorJson));
     }
 
+    @Test
+    public void valid_raw_str() {
+        String errorJson = "[{\"a\":1}{\"b\":2}null undefined 676]";
+
+        boolean valid = true;
+        JSONReader jsonReader = JSONReaderUtils.createJSONReader(errorJson);
+        try {
+            jsonReader.skipValue();
+        } catch (JSONException error) {
+            valid = false;
+        }
+
+        assertFalse(valid);
+    }
+
+    @Test
+    public void valid_raw_str_1() {
+        String errorJson = "[\"a\",\"b\"]";
+
+        boolean valid = true;
+        JSONReader jsonReader = JSONReaderUtils.createJSONReader(errorJson);
+        try {
+            jsonReader.skipValue();
+        } catch (JSONException error) {
+            valid = false;
+        }
+
+        assertTrue(valid);
+    }
+
+
     @Test
     public void valid_utf8() {
         byte[] errorJson = "[{\"a\":1}{\"b\":2}null undefined 676]".getBytes(StandardCharsets.UTF_8);
@@ -42,4 +76,21 @@ public void valid_utf8_1() {
         assertTrue(
                 JSON.isValid(errorJson));
     }
+
+    @Test
+    public void valid_ascii() {
+        byte[] errorJson = "[{\"a\":1}{\"b\":2}null undefined 676]".getBytes(StandardCharsets.UTF_8);
+        assertFalse(
+                JSON.isValid(errorJson, 0, errorJson.length, StandardCharsets.US_ASCII));
+        assertFalse(
+                JSON.isValidArray(errorJson)
+        );
+    }
+
+    @Test
+    public void valid_ascii_1() {
+        byte[] errorJson = "[\"a\",\"b\"]".getBytes(StandardCharsets.UTF_8);
+        assertTrue(
+                JSON.isValid(errorJson, 0, errorJson.length, StandardCharsets.US_ASCII));
+    }
 }