1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8351462: Improve robustness of String concatenation

Browse Source 
Reviewed-by: liach, pminborg, rriggs
This commit is contained in:
Raffaello Giulietti 2025-04-09 15:16:02 +00:00
parent 567c6885a3
commit 1f21da75eb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.base/share/classes/java/lang/StringConcatHelper.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved. * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
@ -52,6 +52,9 @@ final class StringConcatHelper {
byte coder = String.LATIN1; byte coder = String.LATIN1;
for (String c : constants) { for (String c : constants) {
length += c.length(); length += c.length();
if (length < 0) {
throw new OutOfMemoryError("Total length of constants is out of range");
}
coder |= c.coder(); coder |= c.coder();
} }
this.constants = constants; this.constants = constants;