throw correct Exception, for issue #1860

alibaba · Sep 17, 2023 · ee44fb2 · ee44fb2
1 parent c1afa9d
commit ee44fb2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF16.java
@@ -4580,17 +4580,22 @@ public final void readNumber0() {
         }
         final int start = offset;
 
-        final int limit, multmin;
+        final int multmin;
         if (ch == '-') {
-            limit = Integer.MIN_VALUE;
+            if (offset == end) {
+                throw new JSONException(info("illegal input"));
+            }
+
             multmin = -214748364; // limit / 10;
             negative = true;
             ch = chars[offset++];
         } else {
             if (ch == '+') {
+                if (offset == end) {
+                    throw new JSONException(info("illegal input"));
+                }
                 ch = chars[offset++];
             }
-            limit = -2147483647; // -Integer.MAX_VALUE;
             multmin = -214748364; // limit / 10;
         }
 

diff --git a/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java b/core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
@@ -6241,17 +6241,21 @@ public final void readNumber0() {
 
         final int start = offset;
 
-        final int limit, multmin;
+        final int multmin;
         if (ch == '-') {
-            limit = Integer.MIN_VALUE;
+            if (offset == end) {
+                throw new JSONException(info("illegal input"));
+            }
             multmin = -214748364; // limit / 10;
             negative = true;
             ch = (char) bytes[offset++];
         } else {
             if (ch == '+') {
+                if (offset == end) {
+                    throw new JSONException(info("illegal input"));
+                }
                 ch = (char) bytes[offset++];
             }
-            limit = -2147483647; // -Integer.MAX_VALUE;
             multmin = -214748364; // limit / 10;
         }
 

diff --git a/core/src/test/java/com/alibaba/fastjson2/issues_1800/Issue1860.java b/core/src/test/java/com/alibaba/fastjson2/issues_1800/Issue1860.java
@@ -0,0 +1,18 @@
+package com.alibaba.fastjson2.issues_1800;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONException;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class Issue1860 {
+    @Test
+    public void test() {
+        assertThrows(JSONException.class, () -> JSON.parse("+"));
+        assertThrows(JSONException.class, () -> JSON.parse("+".getBytes()));
+
+        assertThrows(JSONException.class, () -> JSON.parse("-"));
+        assertThrows(JSONException.class, () -> JSON.parse("-".getBytes()));
+    }
+}