oops forgot null

Author: marilynel

src/main/java/org/json/JSONTokener.java

@@ -513,18 +513,19 @@ Object nextSimpleValue(char c) {
         Object obj = JSONObject.stringToValue(string);
         // if obj is a boolean, look at string
         if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() && obj instanceof Boolean) {
-            if (!"true".equals(string) && !"false".equals(string)) {
+                jsonParserConfiguration.isStrictMode()) {
+            if (obj instanceof Boolean && !"true".equals(string) && !"false".equals(string)) {
+                // Strict mode only allows lowercase true or false
                 throw this.syntaxError(String.format("Strict mode error: Value '%s' is not lowercase boolean", obj));
             }
-        }
-
-
-        // Strict mode only allows strings with explicit double quotes
-        if (jsonParserConfiguration != null &&
-                jsonParserConfiguration.isStrictMode() &&
-                obj instanceof String) {
-            throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
+            else if (obj == JSONObject.NULL && !"null".equals(string)) {
+                // Strint mode only allows lowercase null
+                throw this.syntaxError(String.format("Strict mode error: Value '%s' is not lowercase null", obj));
+            }
+            else if (obj instanceof String) {
+                // Strict mode only allows strings with explicit double quotes
+                throw this.syntaxError(String.format("Strict mode error: Value '%s' is not surrounded by quotes", obj));
+            }
         }
         return obj;
     }

src/test/java/org/json/junit/JSONObjectTest.java

@@ -3998,7 +3998,7 @@ public void testStrictModeJSONTokener_expectException(){
     }
 
     @Test
-    public void test_strictModeWithMisCasedBooleanValue(){
+    public void test_strictModeWithMisCasedBooleanOrNullValue(){
         JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
 
         try{
@@ -4009,6 +4009,10 @@ public void test_strictModeWithMisCasedBooleanValue(){
             JSONObject j2 = new JSONObject("{\"a\":TRUE}", jsonParserConfiguration);
             fail("Expected an exception");
         } catch (JSONException e) { }
+        try{
+            JSONObject j2 = new JSONObject("{\"a\":nUlL}", jsonParserConfiguration);
+            fail("Expected an exception");
+        } catch (JSONException e) { }
     }
 
     @Test