fix(stleary#887): allow null value strict mode

rikkarth · rikkarth · commit 898dd5a39d83 · 2024-04-23T20:52:02.000+01:00
diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java
@@ -527,7 +527,7 @@ private Object parsedUnquotedText(char c, boolean strictMode) {
     }
 
     private Object getValidNumberOrBooleanFromObject(Object value) {
-        if (value instanceof Number || value instanceof Boolean) {
+        if (value instanceof Number || value instanceof Boolean || value.equals(JSONObject.NULL)) {
             return value;
         }
 
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -75,6 +75,13 @@ public void givenInvalidString_testStrictModeTrue_shouldThrowJsonException() {
         assertEquals("Value is not surrounded by quotes: badString", je.getMessage());
     }
 
+    @Test
+    public void allowNullInStrictMode() {
+        String expected = "[null]";
+        JSONArray jsonArray = new JSONArray(expected, new JSONParserConfiguration().withStrictMode(true));
+        assertEquals(expected, jsonArray.toString());
+    }
+
     @Test
     public void shouldHandleNumericArray() {
         String expected = "[10]";

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ private Object parsedUnquotedText(char c, boolean strictMode) {`
`527`	`527`	`}`
`528`	`528`
`529`	`529`	`private Object getValidNumberOrBooleanFromObject(Object value) {`
`530`		`- if (value instanceof Number \|\| value instanceof Boolean) {`
	`530`	`+ if (value instanceof Number \|\| value instanceof Boolean \|\| value.equals(JSONObject.NULL)) {`
`531`	`531`	`return value;`
`532`	`532`	`}`
`533`	`533`