Merge branch '2.20' into 2.x

Author: cowtowncoder

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

@@ -2629,7 +2629,7 @@ private final int _finishLongTextAscii(int len) throws IOException
         int outPtr = 0;
         while (len > 0) {
             // load as much input as possible
-            int size = Math.min(len, Math.min(outBuf.length, input.length));
+            int size = Math.min(len, Math.min((outBuf.length - outPtr), input.length));
             if (!_tryToLoadToHaveAtLeast(size)) {
                 return len;
             }

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/parse/ParseLongAsciiTextTest.java

@@ -17,19 +17,27 @@ public class ParseLongAsciiTextTest extends CBORTestBase
 
     @Test
     public void testLongNonChunkedAsciiText() throws Exception {
-        try (CBORParser p = CBOR_F.createParser(this.getClass().getResourceAsStream("/data/macbeth-snippet-non-chunked.cbor"))) {
-            assertEquals(JsonToken.VALUE_STRING, p.nextToken());
-            String expected = new String(readResource("/data/macbeth-snippet.txt"), "UTF-8");
-            assertEquals(expected, p.getText());
+        // run several times to allow the internal buffers
+        // to grow
+        for (int x = 0; x < 3 ; x++) {
+            try (CBORParser p = CBOR_F.createParser(this.getClass().getResourceAsStream("/data/macbeth-snippet-non-chunked.cbor"))) {
+                assertEquals(JsonToken.VALUE_STRING, p.nextToken());
+                String expected = new String(readResource("/data/macbeth-snippet.txt"), "UTF-8");
+                assertEquals(expected, p.getText());
+            }
         }
     }
 
     @Test
     public void testLongChunkedAsciiText() throws Exception {
-        try (CBORParser p = CBOR_F.createParser(this.getClass().getResourceAsStream("/data/macbeth-snippet-chunked.cbor"))) {
-            assertEquals(JsonToken.VALUE_STRING, p.nextToken());
-            String expected = new String(readResource("/data/macbeth-snippet.txt"), StandardCharsets.UTF_8);
-            assertEquals(expected, p.getText());
+        // run several times to allow the internal buffers
+        // to grow
+        for (int x = 0; x < 3 ; x++) {
+            try (CBORParser p = CBOR_F.createParser(this.getClass().getResourceAsStream("/data/macbeth-snippet-chunked.cbor"))) {
+                assertEquals(JsonToken.VALUE_STRING, p.nextToken());
+                String expected = new String(readResource("/data/macbeth-snippet.txt"), StandardCharsets.UTF_8);
+                assertEquals(expected, p.getText());
+            }
         }
     }
 }

cbor/src/test/resources/data/macbeth-snippet-chunked.cbor

@@ -1,4 +1,5 @@
-y�---
+y�The Tragedy of Macbeth, often shortened to Macbeth, is a tragedy by William Shakespeare, estimated to have been first performed in 1606
+---
 Act I, Scene  
 
 A desert place.
@@ -117,11 +118,11 @@ First Witch. Where hast thou been, sister?
 Second Witch. Killing swine.
 Third Witch. Sister, where thou? 
 First Witch. A sailor's wife had chestnuts in her lap,
-And munch'd, and munch'd, and munch'd:-
+And munch'd, and munch'd, any�d munch'd:-
 'Give me,' quoth I:
 'Aroint thee, witch!' the rump-fed ronyon cries.
 Her husband's to Aleppo gone, master o' the Tiger: 
-Buty� in a sieve I'll thither sail,
+But in a sieve I'll thither sail,
 And, like a rat without a tail,
 I'll do, I'll do, and I'll do.
 Second Witch. I'll give thee a wind.
@@ -223,12 +224,13 @@ Nothing afeard of what thyself didst make,
 Strange images of death. As thick as hail
 Came post with post; and every one did bear
 Thy praises in his kingdom's great defence,
-And pour'd them down before him.
+And pour'd them down before himy
+f.
 Angus. We are sent 
 To give thee from our royal master thanks;
 Only to herald thee into his sight,
 Not pay thee.
-Ross. And, for an eary	�nest of a greater honour,
+Ross. And, for an earnest of a greater honour,
 He bade me, from him, call thee thane of Cawdor: 
 In which addition, hail, most worthy thane!
 For it is thine.

cbor/src/test/resources/data/macbeth-snippet-non-chunked.cbor

@@ -1,4 +1,5 @@
-y)---
+y)�The Tragedy of Macbeth, often shortened to Macbeth, is a tragedy by William Shakespeare, estimated to have been first performed in 1606
+---
 Act I, Scene  
 
 A desert place.

cbor/src/test/resources/data/macbeth-snippet.txt

@@ -1,3 +1,4 @@
+The Tragedy of Macbeth, often shortened to Macbeth, is a tragedy by William Shakespeare, estimated to have been first performed in 1606
 ---
 Act I, Scene  
 

release-notes/CREDITS-2.x

@@ -386,6 +386,9 @@ Manuel Sugawara (@sugmanue)
   (2.19.0)
  * Contributed fix for #616: CBOR text gets truncated on decoding
   (2.19.3)
+ * Conribued fix for #640: (cbor) CBOR throws ArrayIndexOutOfBoundsException
+   with long ASCII text
+  (2.20.2)
 
 Josh Curry (@seadbrane)
  * Reported, contributed fix for #571: Unable to deserialize a pojo with IonStruct

release-notes/VERSION-2.x

@@ -24,6 +24,11 @@ Active maintainers:
  (reported by Josh C)
 - (avro) Upgrade `avro` lib dep to 1.11.5 (from 1.11.4)
 
+2.20.2 (not yet released)
+
+#640: (cbor) CBOR throws ArrayIndexOutOfBoundsException with long ASCII text
+ (reported, fix contributed by Manuel S)
+
 2.20.1 (30-Oct-2025)
 
 #599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties