fixes #372.

Corrects behavior of unclosed arrays
stleary · Oct 30, 2017 · ed8745c · ed8745c
1 parent cdf3cf7
commit ed8745c
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/JSONArray.java b/JSONArray.java
@@ -107,7 +107,13 @@ public JSONArray(JSONTokener x) throws JSONException {
         if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
-        if (x.nextClean() != ']') {
+
+        char nextChar = x.nextClean();
+        if (nextChar == 0) {
+            // array is unclosed. No ']' found, instead EOF
+            throw new JSONException(x.syntaxError("Expected a ',' or ']'"));
+        }
+        if (nextChar != ']') {
             x.back();
             for (;;) {
                 if (x.nextClean() == ',') {
@@ -118,8 +124,16 @@ public JSONArray(JSONTokener x) throws JSONException {
                     this.myArrayList.add(x.nextValue());
                 }
                 switch (x.nextClean()) {
+                case 0:
+                    // array is unclosed. No ']' found, instead EOF
+                    throw new JSONException(x.syntaxError("Expected a ',' or ']'"));
                 case ',':
-                    if (x.nextClean() == ']') {
+                    nextChar = x.nextClean();
+                    if (nextChar == 0) {
+                        // array is unclosed. No ']' found, instead EOF
+                        throw new JSONException(x.syntaxError("Expected a ',' or ']'"));
+                    }
+                    if (nextChar == ']') {
                         return;
                     }
                     x.back();