Merge branch '2.13' into 2.14

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/JsonPointer.java

@@ -174,8 +174,10 @@ public static JsonPointer forPath(JsonStreamContext context,
         if (context == null) {
             return EMPTY;
         }
+        // Otherwise if context was just created but is not advanced -- like,
+        // opening START_ARRAY/START_OBJECT returned -- drop the empty context.
         if (!context.hasPathSegment()) {
-            // one special case; do not prune root if we need it
+            // Except one special case: do not prune root if we need it
             if (!(includeRoot && context.inRoot() && context.hasCurrentIndex())) {
                 context = context.getParent();
             }

src/test/java/com/fasterxml/jackson/core/read/ParserSymbolHandlingTest.java

@@ -52,4 +52,68 @@ private void _testSymbolsWithNull(JsonFactory f, boolean useBytes) throws Except
         assertToken(JsonToken.END_OBJECT, parser.nextToken());
         parser.close();
     }
+
+    // // Additional testing inspired by [dataformats-binary#312]; did not
+    // // affect JSON backend but wanted to ensure
+
+    public void testSymbolsWithNullOnlyNameBytes() throws Exception {
+        JsonFactory f = new JsonFactory();
+        _testSymbolsWithNullOnlyNameBytes(f, true);
+        // and repeat with same factory, just for fun, and to ensure symbol table is fine
+        _testSymbolsWithNullOnlyNameBytes(f, true);
+    }
+
+    public void testSymbolsWithNullOnlyNameChars() throws Exception {
+        JsonFactory f = new JsonFactory();
+        _testSymbolsWithNullOnlyNameBytes(f, false);
+        _testSymbolsWithNullOnlyNameBytes(f, false);
+    }
+
+    private void _testSymbolsWithNullOnlyNameBytes(JsonFactory f, boolean useBytes) throws Exception
+    {
+        final String FIELD1 = "\u0000";
+        final String FIELD2 = FIELD1 + FIELD1;
+        final String FIELD3 = FIELD2 + FIELD1;
+        final String FIELD4 = FIELD3 + FIELD1;
+        final String QUOTED_NULL = "\\u0000";
+
+        final String INPUT = a2q(String.format("{'%s':1, '%s':2, '%s':3, '%s':4}",
+                QUOTED_NULL, QUOTED_NULL + QUOTED_NULL,
+                QUOTED_NULL + QUOTED_NULL + QUOTED_NULL,
+                QUOTED_NULL + QUOTED_NULL + QUOTED_NULL + QUOTED_NULL
+                ));
+        JsonParser p = useBytes ? f.createParser(INPUT.getBytes("UTF-8"))
+                : f.createParser(INPUT);
+
+        assertToken(JsonToken.START_OBJECT, p.nextToken());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        _assertNullStrings(FIELD1, p.currentName());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(1, p.getIntValue());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        _assertNullStrings(FIELD2, p.currentName());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(2, p.getIntValue());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        _assertNullStrings(FIELD3, p.currentName());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(3, p.getIntValue());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        _assertNullStrings(FIELD4, p.currentName());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(4, p.getIntValue());
+
+        assertToken(JsonToken.END_OBJECT, p.nextToken());
+    }
+
+    private void _assertNullStrings(String exp, String actual) {
+        if (exp.length() != actual.length()) {
+            fail("Expected "+exp.length()+" nulls, got "+actual.length());
+        }
+        assertEquals(exp, actual);
+    }
 }

src/test/java/com/fasterxml/jackson/failing/JsonPointerOOME736Test.java

@@ -8,6 +8,7 @@ public class JsonPointerOOME736Test extends BaseTest
     // such as https://github.com/nst/JSONTestSuite/blob/master/test_parsing/n_structure_100000_opening_arrays.json
     public void testDeepJsonPointer() throws Exception {
         int MAX_DEPTH = 100000;
+        // Create nesting of 100k arrays
         String INPUT = new String(new char[MAX_DEPTH]).replace("\0", "[");
         JsonParser parser = createParser(MODE_READER, INPUT);
         try {