michael-ameri
diff --git a/‎src/main/java/org/json/JSONObject.java‎
Lines changed: 3 additions & 0 deletions b/‎src/main/java/org/json/JSONObject.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/test/java/org/json/junit/JSONObjectTest.java‎
Lines changed: 9 additions & 0 deletions b/‎src/test/java/org/json/junit/JSONObjectTest.java‎
Lines changed: 9 additions & 0 deletions
@@ -256,6 +256,9 @@ public JSONObject(JSONTokener x) throws JSONException {
                 if (x.nextClean() == '}') {
                     return;
                 }
+                if (x.end()) {
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                }
                 x.back();
                 break;
             case '}':
 
@@ -2225,6 +2225,15 @@ public void jsonObjectParsingErrors() {
                     "Expected a ',' or '}' at 15 [character 16 line 1]",
                     e.getMessage());
         }
+        try {
+            // \0 after ,
+            String str = "{\"myKey\":true, \0\"myOtherKey\":false}";
+            assertNull("Expected an exception",new JSONObject(str));
+        } catch (JSONException e) {
+            assertEquals("Expecting an exception message",
+                    "A JSONObject text must end with '}' at 15 [character 16 line 1]",
+                    e.getMessage());
+        }
         try {
             // append to wrong key
             String str = "{\"myKey\":true, \"myOtherKey\":false}";