improved JSONValidator, fix #3516

alibaba · Nov 5, 2020 · ab13b03 · ab13b03
1 parent 13f3f2b
commit ab13b03
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/JSONValidator.java b/src/main/java/com/alibaba/fastjson/JSONValidator.java
@@ -14,6 +14,7 @@ public enum Type {
     protected int pos = -1;
     protected char ch;
     protected Type type;
+    private Boolean valiateResult;
 
     protected int count = 0;
     protected boolean supportMultiValue = false;
@@ -54,13 +55,19 @@ public Type getType() {
     abstract void next();
 
     public boolean validate() {
+        if (valiateResult != null) {
+            return valiateResult;
+        }
+
         for (;;) {
             if (!any()) {
+                valiateResult = false;
                 return false;
             }
 
             count++;
             if (eof) {
+                valiateResult = true;
                 return true;
             }
 
@@ -71,10 +78,12 @@ public boolean validate() {
                 }
                 continue;
             } else {
+                valiateResult = false;
                 return false;
             }
         }
 
+        valiateResult = true;
         return true;
     }
 

diff --git a/src/test/java/com/alibaba/json/bvt/issue_3500/Issue3516.java b/src/test/java/com/alibaba/json/bvt/issue_3500/Issue3516.java
@@ -0,0 +1,12 @@
+package com.alibaba.json.bvt.issue_3500;
+
+import com.alibaba.fastjson.JSONValidator;
+import junit.framework.TestCase;
+
+public class Issue3516 extends TestCase {
+    public void test_for_issue() throws Exception {
+        JSONValidator validator = JSONValidator.from("{}");
+        assertEquals(JSONValidator.Type.Object, validator.getType());
+        assertTrue(validator.validate());
+    }
+}