Merge branch '2.18' into 2.19

Author: cowtowncoder

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

@@ -3313,6 +3313,25 @@ protected void _skipIncomplete() throws IOException
                 && type != CBORConstants.MAJOR_TYPE_BYTES) {
             _throwInternal();
         }
+
+        // [dataformats-binary#599]: If we are in a stringref namespace, we need to
+        // actually read and store the string/bytes value instead of just skipping it,
+        // so that later string references can find it.
+        // The finish methods will determine if the value should be added to the
+        // reference table based on shouldReferenceString().
+        if (!_stringRefs.empty()) {
+            if (type == CBORConstants.MAJOR_TYPE_TEXT) {
+                // Need to actually read the text (which may add to stringRefs)
+                _finishTextToken(_typeByte);
+            } else {
+                // For bytes: decode length then read (which may add to stringRefs)
+                int len = _decodeExplicitLength(_typeByte & 0x1F);
+                _finishBytes(len);
+            }
+            return;
+        }
+
+        // Standard skip logic when not in stringref namespace
         final int lowBits = _typeByte & 0x1F;
         if (lowBits <= 23) {
             if (lowBits > 0) {

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java

@@ -0,0 +1,44 @@
+package com.fasterxml.jackson.dataformat.cbor;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.Test;
+
+public class StringRef599Test extends CBORTestBase
+{
+    private final ObjectMapper VANILLA_MAPPER = cborMapper();
+    private final ObjectMapper REF_MAPPER = cborMapper(cborFactoryBuilder()
+            .enable(CBORGenerator.Feature.STRINGREF)
+            .build());
+
+    // [dataformats-binary#599]
+    @Test
+    public void testDupsNoStringRef() throws Exception
+    {
+        _testStringRef(VANILLA_MAPPER);
+    }
+
+    // [dataformats-binary#599]
+    @Test
+    public void testDupsWithStringRef() throws Exception
+    {
+        _testStringRef(REF_MAPPER);
+    }
+
+    private void _testStringRef(ObjectMapper mapper) throws Exception
+    {
+        byte[] cbor = mapper.writeValueAsBytes(Arrays.asList("foo", "foo"));
+        try (CBORParser p = cborParser(cbor)) {
+             assertToken(JsonToken.START_ARRAY, p.nextToken());
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // important! Skip String value
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // equally important; try to check second instance
+             assertEquals("foo", p.getText());
+             assertToken(JsonToken.END_ARRAY, p.nextToken());
+        }
+    }
+}

release-notes/VERSION-2.x

@@ -66,6 +66,8 @@ No changes since 2.19.1
 
 2.18.5 (not yet released)
 
+#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
+ (reported by Yohei K)
 #623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
  (requested by @Shaurya0108)