archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8320570: NegativeArraySizeException decoding >1G UTF8 bytes with non-ascii characters

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Jim Laskey 2023-12-06 21:55:05 +00:00
parent 781775d73b
commit 82796bdebb
2 changed files with 82 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/share/classes/java/lang/String.java
View file

@ -592,7 +592,7 @@ public final class String
this.coder = LATIN1;
return;
}
byte[] utf16 = new byte[length << 1];
byte[] utf16 = StringUTF16.newBytesFor(length);
StringLatin1.inflate(latin1, 0, utf16, 0, dp);
dp = decodeUTF8_UTF16(latin1, sp, length, utf16, dp, true);
if (dp != length) {
@ -601,7 +601,7 @@ public final class String
this.value = utf16;
this.coder = UTF16;
} else { // !COMPACT_STRINGS
byte[] dst = new byte[length << 1];
byte[] dst = StringUTF16.newBytesFor(length);
int dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, true);
if (dp != length) {
dst = Arrays.copyOf(dst, dp << 1);
@ -622,7 +622,7 @@ public final class String
this.value = Arrays.copyOfRange(bytes, offset, offset + length);
this.coder = LATIN1;
} else {
byte[] dst = new byte[length << 1];
byte[] dst = StringUTF16.newBytesFor(length);
int dp = 0;
while (dp < length) {
int b = bytes[offset++];
@ -763,15 +763,15 @@ public final class String
return new String(dst, LATIN1);
}
if (dp == 0) {
dst = new byte[length << 1];
dst = StringUTF16.newBytesFor(length);
} else {
byte[] buf = new byte[length << 1];
byte[] buf = StringUTF16.newBytesFor(length);
StringLatin1.inflate(dst, 0, buf, 0, dp);
dst = buf;
}
dp = decodeUTF8_UTF16(bytes, offset, sl, dst, dp, false);
} else { // !COMPACT_STRINGS
dst = new byte[length << 1];
dst = StringUTF16.newBytesFor(length);
dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, false);
}
if (dp != length) {
@ -1316,7 +1316,7 @@ public final class String
}
int dp = 0;
byte[] dst = new byte[val.length << 1];
byte[] dst = StringUTF16.newBytesFor(val.length);
for (byte c : val) {
if (c < 0) {
dst[dp++] = (byte) (0xc0 | ((c & 0xff) >> 6));