Merge branch '2.13' into 2.14

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -2905,9 +2905,9 @@ private final String _findDecodedFromSymbols(final int len) throws IOException
 
         // First quadbyte is easy
         int q1 = (inBuf[inPtr++] & 0xFF);
-        q1 =  (q1 << 8) | (inBuf[inPtr++] & 0xFF);
-        q1 =  (q1 << 8) | (inBuf[inPtr++] & 0xFF);
-        q1 =  (q1 << 8) | (inBuf[inPtr++] & 0xFF);
+        q1 = (q1 << 8) | (inBuf[inPtr++] & 0xFF);
+        q1 = (q1 << 8) | (inBuf[inPtr++] & 0xFF);
+        q1 = (q1 << 8) | (inBuf[inPtr++] & 0xFF);
 
         if (len < 9) {
             int q2 = (inBuf[inPtr++] & 0xFF);
@@ -3009,7 +3009,15 @@ private final String _addDecodedToSymbols(int len, String name) {
 
     private static int[] _growArrayTo(int[] arr, int minSize) {
         return Arrays.copyOf(arr, minSize+4);
-    }    
+    }
+
+    // Helper method needed to fix [dataformats-binary#312], masking of 0x00 character
+    // 26-Feb-2022, tatu: not yet used
+    /*
+    private final static int _padLastQuad(int q, int bytes) {
+        return (bytes == 4) ? q : (q | (-1 << (bytes << 3)));
+    }
+    */
 
     /*
     /**********************************************************

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/failing/SymbolTable312Test.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.dataformat.cbor.failing;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;
+
+public class SymbolTable312Test extends CBORTestBase
+{
+    private final ObjectMapper MAPPER = cborMapper();
+
+    // [dataformats-binary#312]: null handling
+    public void testNullHandling() throws Exception
+    {
+        final String FIELD1 = "\u0000";
+        final String FIELD2 = FIELD1 + FIELD1;
+        final String FIELD3 = FIELD2 + FIELD1;
+
+        final String QUOTED_NULL = "\\u0000";
+
+        final String SRC = a2q(String.format("{'%s':'a','%s':'b','%s':'c'}",
+                QUOTED_NULL, QUOTED_NULL+QUOTED_NULL, QUOTED_NULL+QUOTED_NULL+QUOTED_NULL));
+        byte[] DOC = cborDoc(SRC);
+
+        try (JsonParser p = MAPPER.createParser(DOC)) {
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD1, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("a", p.getText());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD2, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("b", p.getText());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD3, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("c", p.getText());
+
+            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);
+    }
+}

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/failing/SymbolTable312Test.java

@@ -0,0 +1,53 @@
+package com.fasterxml.jackson.dataformat.smile.failing;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+
+public class SymbolTable312Test extends BaseTestForSmile
+{
+    private final ObjectMapper MAPPER = smileMapper();
+
+    // [dataformats-binary#312]: null handling
+    public void testNullHandling() throws Exception
+    {
+        final String FIELD1 = "\u0000";
+        final String FIELD2 = FIELD1 + FIELD1;
+        final String FIELD3 = FIELD2 + FIELD1;
+
+        final String QUOTED_NULL = "\\u0000";
+        
+        final String SRC = a2q(String.format("{'%s':'a','%s':'b','%s':'c'}",
+                QUOTED_NULL, QUOTED_NULL+QUOTED_NULL, QUOTED_NULL+QUOTED_NULL+QUOTED_NULL));
+        byte[] DOC = _smileDoc(SRC);
+
+        try (JsonParser p = MAPPER.createParser(DOC)) {
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD1, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("a", p.getText());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD2, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("b", p.getText());
+
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            _assertNullStrings(FIELD3, p.currentName());
+            assertToken(JsonToken.VALUE_STRING, p.nextToken());
+            assertEquals("c", p.getText());
+
+            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);
+    }
+}