add null checks before accessing jsonParserConfiguration

stleary · Jan 8, 2025 · 0631db1 · 0631db1
1 parent dc10ec9
commit 0631db1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -141,14 +141,14 @@ public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration)
                     }
                     if (nextChar == ']') {
                         // trailing commas are not allowed in strict mode
-                        if (jsonParserConfiguration.isStrictMode()) {
+                        if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
                             throw x.syntaxError("Strict mode error: Expected another array element");
                         }
                         return;
                     }
                     if (nextChar == ',') {
                         // consecutive commas are not allowed in strict mode
-                        if (jsonParserConfiguration.isStrictMode()) {
+                        if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
                             throw x.syntaxError("Strict mode error: Expected a valid array element");
                         }
                         return;

diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -255,7 +255,7 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
             if (key != null) {
                 // Check if key exists
                 boolean keyExists = this.opt(key) != null;
-                if (keyExists && !jsonParserConfiguration.isOverwriteDuplicateKey()) {
+                if (keyExists && jsonParserConfiguration != null && !jsonParserConfiguration.isOverwriteDuplicateKey()) {
                     throw x.syntaxError("Duplicate key \"" + key + "\"");
                 }
 
@@ -271,13 +271,13 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
             switch (x.nextClean()) {
             case ';':
                 // In strict mode semicolon is not a valid separator
-                if (jsonParserConfiguration.isStrictMode()) {
+                if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
                     throw x.syntaxError("Strict mode error: Invalid character ';' found");
                 }
             case ',':
                 if (x.nextClean() == '}') {
                     // trailing commas are not allowed in strict mode
-                    if (jsonParserConfiguration.isStrictMode()) {
+                    if (jsonParserConfiguration != null && jsonParserConfiguration.isStrictMode()) {
                         throw x.syntaxError("Strict mode error: Expected another object element");
                     }
                     return;