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

fix: set default maximum nesting depth as 512

Browse Source
This commit is contained in:
Cleydyr de Albuquerque 2023-02-02 18:15:03 +01:00
parent 651511f500
commit eb56704e68
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/json/XMLParserConfiguration.java
View File

@ -22,6 +22,11 @@ public class XMLParserConfiguration {
*/ */
public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1; public static final int UNDEFINED_MAXIMUM_NESTING_DEPTH = -1;
/**
* The default maximum nesting depth when parsing a XML document to JSON.
*/
public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = 512;
/** Original Configuration of the XML Parser. */ /** Original Configuration of the XML Parser. */
public static final XMLParserConfiguration ORIGINAL public static final XMLParserConfiguration ORIGINAL
= new XMLParserConfiguration(); = new XMLParserConfiguration();
@ -64,7 +69,7 @@ public class XMLParserConfiguration {
* When parsing the XML into JSON, specifies the tags whose values should be converted * When parsing the XML into JSON, specifies the tags whose values should be converted
* to arrays * to arrays
*/ */
private int maxNestingDepth = UNDEFINED_MAXIMUM_NESTING_DEPTH; private int maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
/** /**
* Default parser configuration. Does not keep strings (tries to implicitly convert * Default parser configuration. Does not keep strings (tries to implicitly convert
@ -321,8 +326,8 @@ public class XMLParserConfiguration {
/** /**
* Defines the maximum nesting depth that the parser will descend before throwing an exception * Defines the maximum nesting depth that the parser will descend before throwing an exception
* when parsing the XML into JSON. The default max nesting depth is undefined, which means the * when parsing the XML into JSON. The default max nesting depth is 512, which means the parser
* parser will go as deep as the maximum call stack size allows. Using any negative value as a * will go as deep as the maximum call stack size allows. Using any negative value as a
* parameter is equivalent to setting no limit to the nesting depth. * parameter is equivalent to setting no limit to the nesting depth.
* @param maxNestingDepth the maximum nesting depth allowed to the XML parser * @param maxNestingDepth the maximum nesting depth allowed to the XML parser
* @return The existing configuration will not be modified. A new configuration is returned. * @return The existing configuration will not be modified. A new configuration is returned.

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

@ -6,7 +6,6 @@ Public Domain.
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

2
src/test/java/org/json/junit/XMLConfigurationTest.java
View File

@ -1056,7 +1056,7 @@ public class XMLConfigurationTest {
public void testMaxNestingDepthIsSet() { public void testMaxNestingDepthIsSet() {
XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL; XMLParserConfiguration xmlParserConfiguration = XMLParserConfiguration.ORIGINAL;
assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.UNDEFINED_MAXIMUM_NESTING_DEPTH); assertEquals(xmlParserConfiguration.getMaxNestingDepth(), XMLParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(42); xmlParserConfiguration = xmlParserConfiguration.withMaxNestingDepth(42);