Incorrect recursion depth check in JSONTokener

jettison-json · Dec 5, 2022 · 888eec8 · Fabio1988 · Dec 5, 2022 · coheigea
1 parent 677aba5
commit 888eec8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/codehaus/jettison/json/JSONTokener.java b/src/main/java/org/codehaus/jettison/json/JSONTokener.java
@@ -426,12 +426,16 @@ public Object nextValue() throws JSONException {
 
  protected JSONObject newJSONObject() throws JSONException {
  checkRecursionDepth();
- return new JSONObject(this);
+ JSONObject object = new JSONObject(this);
+ recursionDepth--;
+ return object;
  }
 
  protected JSONArray newJSONArray() throws JSONException {
  checkRecursionDepth();
- return new JSONArray(this);
+ JSONArray array = new JSONArray(this);
+ recursionDepth--;
+ return array;
  }
 
  private void checkRecursionDepth() throws JSONException {

diff --git a/src/test/java/org/codehaus/jettison/json/JSONArrayTest.java b/src/test/java/org/codehaus/jettison/json/JSONArrayTest.java
@@ -63,4 +63,10 @@ public void testInfiniteLoop2() {
  // expected
  }
  }
+
+ public void testIssue52() throws JSONException {
+ new JSONObject().setRecursionDepthLimit(10);
+ new JSONArray("[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {a:10}]");
+ }
+
 }