Prevent infinite loop when a /* comment is not terminated

jettison-json · Sep 22, 2022 · 1268b75 · 1268b75
1 parent cff9f28
commit 1268b75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/org/codehaus/jettison/json/JSONTokener.java b/src/main/java/org/codehaus/jettison/json/JSONTokener.java
@@ -192,7 +192,6 @@ public char nextClean() throws JSONException {
                             if (next() == '/') {
                                 break;
                             }
-                            back();
                         }
                     }
                     break;

diff --git a/src/test/java/org/codehaus/jettison/json/JSONArrayTest.java b/src/test/java/org/codehaus/jettison/json/JSONArrayTest.java
@@ -43,6 +43,24 @@ public void testEscapingInArrayIsTrunedOff() throws JSONException {
       String expectedValue = "[\"a string with / character\",{\"key\":\"http://example.com/foo\"}]";
       assertEquals(expectedValue, array.toString());
     }
-
-
+
+    public void testInfiniteLoop() {
+        String str = "[*/*A25] **";
+        try {
+            new JSONArray(str);
+            fail("Failure expected on malformed JSON");
+        } catch (JSONException ex) {
+            // expected
+        }
+    }
+
+    public void testInfiniteLoop2() {
+        String str = "[/";
+        try {
+            new JSONArray(str);
+            fail("Failure expected on malformed JSON");
+        } catch (JSONException ex) {
+            // expected
+        }
+    }
 }