Merge branch '2.x' into 3.0

cowtowncoder · cowtowncoder · commit 1fb46ca9219b · 2025-11-27T15:08:34.000-08:00
diff --git a/src/main/java/tools/jackson/core/io/UTF32Reader.java b/src/main/java/tools/jackson/core/io/UTF32Reader.java
@@ -116,7 +116,7 @@ public int read(char[] cbuf, int start, int len) throws IOException
         if (_buffer == null) { return -1; }
         if (len < 1) { return len; }
         // Let's then ensure there's enough room...
-        if (start < 0 || (start+len) > cbuf.length) {
+        if (start < 0 || len < 0 || start > (cbuf.length - len)) {
             reportBounds(cbuf, start, len);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public int read(char[] cbuf, int start, int len) throws IOException`
`116`	`116`	`if (_buffer == null) { return -1; }`
`117`	`117`	`if (len < 1) { return len; }`
`118`	`118`	`// Let's then ensure there's enough room...`
`119`		`- if (start < 0 \|\| (start+len) > cbuf.length) {`
	`119`	`+ if (start < 0 \|\| len < 0 \|\| start > (cbuf.length - len)) {`
`120`	`120`	`reportBounds(cbuf, start, len);`
`121`	`121`	`}`
`122`	`122`