Merge branch '2.12' into 2.13

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

@@ -2799,6 +2799,11 @@ private final String _decodeContiguousName(int len) throws IOException
 
     private final String _decodeLongerName(int len) throws IOException
     {
+        // [dataformats-binary#288]: non-canonical length of 0 needs to be
+        // dealt with
+        if (len == 0)  {
+            return "";
+        }
         // Do we have enough buffered content to read?
         if ((_inputEnd - _inputPtr) < len) {
             // or if not, could we read?

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/fuzz/Fuzz288_35750_NonCanonicalNameTest.java

@@ -0,0 +1,28 @@
+package com.fasterxml.jackson.dataformat.cbor.fuzz;
+
+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 Fuzz288_35750_NonCanonicalNameTest extends CBORTestBase
+{
+    private final ObjectMapper MAPPER = cborMapper();
+
+    // [dataformats-binary#288]: non-canonical representation for length of 0
+    // causing ArrayOutOfBoundsException
+    public void testInvalidLongName() throws Exception
+    {
+        final byte[] input = new byte[] {
+                (byte) 0x8A,
+                (byte) 0xAD, 0x7A, 0x00,
+                0x00, 0x00, 0x00
+        };
+
+        try (JsonParser p = MAPPER.createParser(input)) {
+            assertToken(JsonToken.START_ARRAY, p.nextToken());
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        }
+    }
+}

release-notes/VERSION-2.x

@@ -36,6 +36,7 @@ Modules:
 2.12.4 (not yet released)
 
 #287: (cbor) Uncaught exception in CBORParser._nextChunkedByte2 (by ossfuzzer)
+#288: (cbor) Uncaught exception in CBORParser._findDecodedFromSymbols() (by ossfuzzer)
 
 2.12.3 (12-Apr-2021)