Fixes #1207: apply "maxNameLength" change to CharsToNameCaonicalizer (#…

…1208)
FasterXML · Jan 31, 2024 · 500e960 · 500e960
1 parent 9438a5e
commit 500e960
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -38,6 +38,9 @@ a pure JSON library.
 #1195: Use `BufferRecycler` provided by output (`OutputStream`, `Writer`) object if available
  (contributed by Mario F)
 #1202: Add `RecyclerPool.clear()` method for dropping all pooled Objects
+#1205: JsonFactory.setStreamReadConstraints(StreamReadConstraints) fails to
+  update "maxNameLength" for symbol tables
+ (reported by @denizk)
 
 2.16.2 (not yet released)
 

diff --git a/src/main/java/com/fasterxml/jackson/core/JsonFactory.java b/src/main/java/com/fasterxml/jackson/core/JsonFactory.java
@@ -221,8 +221,11 @@ public static int collectDefaults() {
      * Each factory comes equipped with a shared root symbol table.
      * It should not be linked back to the original blueprint, to
      * avoid contents from leaking between factories.
+     *<p>
+     * NOTE: non-final since 2.17 due to need to re-create if
+     * {@link StreamReadConstraints} re-configured for factory.
      */
-    protected final transient CharsToNameCanonicalizer _rootCharSymbols;
+    protected transient CharsToNameCanonicalizer _rootCharSymbols;
 
     /**
      * Alternative to the basic symbol table, some stream-based
@@ -870,7 +873,13 @@ public StreamWriteConstraints streamWriteConstraints() {
      * @since 2.15
      */
     public JsonFactory setStreamReadConstraints(StreamReadConstraints src) {
+        final int maxNameLen = _streamReadConstraints.getMaxNameLength();
         _streamReadConstraints = Objects.requireNonNull(src);
+        // 30-Jan-2024, tatu: [core#1207] Need to recreate if max-name-length
+        //    setting changes
+        if (_streamReadConstraints.getMaxNameLength() != maxNameLen) {
+            _rootCharSymbols = CharsToNameCanonicalizer.createRoot(this);
+        }
         return this;
     }
 

diff --git a/src/test/java/com/fasterxml/jackson/core/constraints/LargeNameReadTest.java b/src/test/java/com/fasterxml/jackson/core/constraints/LargeNameReadTest.java
@@ -16,6 +16,12 @@ public class LargeNameReadTest extends BaseTest
             .streamReadConstraints(StreamReadConstraints.builder().maxNameLength(100).build())
             .build();
 
+    private final JsonFactory JSON_F_NAME_100_B = new JsonFactory();
+    {
+        JSON_F_NAME_100_B.setStreamReadConstraints(StreamReadConstraints.builder()
+                .maxNameLength(100).build());
+    }
+
     // Test name that is below default max name
     public void testLargeNameBytes() throws Exception {
         final String doc = generateJSON(StreamReadConstraints.defaults().getMaxNameLength() - 100);
@@ -31,21 +37,31 @@ public void testLargeNameChars() throws Exception {
         }
     }
 
-    public void testLargeNameWithSmallLimitBytes() throws Exception
+    public void testLargeNameWithSmallLimitBytes() throws Exception {
+        _testLargeNameWithSmallLimitBytes(JSON_F_NAME_100);
+        _testLargeNameWithSmallLimitBytes(JSON_F_NAME_100_B);
+    }
+
+    private void _testLargeNameWithSmallLimitBytes(JsonFactory jf) throws Exception
     {
         final String doc = generateJSON(1000);
-        try (JsonParser p = createParserUsingStream(JSON_F_NAME_100, doc, "UTF-8")) {
+        try (JsonParser p = createParserUsingStream(jf, doc, "UTF-8")) {
             consumeTokens(p);
             fail("expected StreamConstraintsException");
         } catch (StreamConstraintsException e) {
             verifyException(e, "Name length");
         }
     }
 
-    public void testLargeNameWithSmallLimitChars() throws Exception
+    public void testLargeNameWithSmallLimitChars() throws Exception {
+        _testLargeNameWithSmallLimitChars(JSON_F_NAME_100);
+        _testLargeNameWithSmallLimitChars(JSON_F_NAME_100_B);
+    }
+
+    private void _testLargeNameWithSmallLimitChars(JsonFactory jf) throws Exception
     {
         final String doc = generateJSON(1000);
-        try (JsonParser p = createParserUsingReader(JSON_F_NAME_100, doc)) {
+        try (JsonParser p = createParserUsingReader(jf, doc)) {
             consumeTokens(p);
             fail("expected StreamConstraintsException");
         } catch (StreamConstraintsException e) {