Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-02 11:05:28 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #948 from Simulant87/947-JSONTokener-configuration-ignored

Browse Source 
use JSONParserConfiguration of JSONTokener in JSONObject and JSONArray constructor instead of creating a new one
This commit is contained in:
Sean Leary 2025-01-19 09:09:42 -06:00 committed by GitHub
commit 22f8290840
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/json/JSONArray.java
View File

@ -83,7 +83,7 @@ public class JSONArray implements Iterable<Object> {
* If there is a syntax error.
*/
public JSONArray(JSONTokener x) throws JSONException {
this(x, new JSONParserConfiguration());
this(x, x.getJsonParserConfiguration());
}
/**

2
src/main/java/org/json/JSONObject.java
View File

@ -195,7 +195,7 @@ public class JSONObject {
* duplicated key.
*/
public JSONObject(JSONTokener x) throws JSONException {
this(x, new JSONParserConfiguration());
this(x, x.getJsonParserConfiguration());
}
/**

9
src/test/java/org/json/junit/JSONArrayTest.java
View File

@ -8,6 +8,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@ -1509,6 +1510,14 @@ public class JSONArrayTest {
new JSONArray(array);
}
@Test
public void testStrictModeJSONTokener_expectException(){
JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
JSONTokener tokener = new JSONTokener("[\"value\"]invalidCharacters", jsonParserConfiguration);
assertThrows(JSONException.class, () -> { new JSONArray(tokener); });
}
public static ArrayList<Object> buildNestedArray(int maxDepth) {
if (maxDepth <= 0) {
return new ArrayList<>();

9
src/test/java/org/json/junit/JSONObjectTest.java
View File

@ -3853,6 +3853,15 @@ public class JSONObjectTest {
assertEquals(j3.getString("hex6"), "0011");
}
@Test
public void testStrictModeJSONTokener_expectException(){
JSONParserConfiguration jsonParserConfiguration = new JSONParserConfiguration().withStrictMode();
JSONTokener tokener = new JSONTokener("{\"key\":\"value\"}invalidCharacters", jsonParserConfiguration);
assertThrows(JSONException.class, () -> { new JSONObject(tokener); });
}
/**
* Method to build nested map of max maxDepth
*