8321180: Condition for non-latin1 string size too large exception is off by one #17008

RogerRiggs · 2023-12-06T23:31:26Z

In the compact string implementation of non-latin1 (UTF16) strings the length is constrained by VM implementation limit on the size a byte array that can be allocated. To produce a useful exception the implementation checks the string size against the maximum byte array size. The exception message is correct

"UTF16 String size is " + len + ", should be less than or equal to " + MAX_LENGTH

The code should match the message, otherwise the exception thrown is:

java.lang.OutOfMemoryError: Requested array size exceeds VM limit

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8321180: Condition for non-latin1 string size too large exception is off by one (Bug - P4)

Reviewers

Raffaello Giulietti (@rgiulietti - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17008/head:pull/17008
$ git checkout pull/17008

Update a local copy of the PR:
$ git checkout pull/17008
$ git pull https://git.openjdk.org/jdk.git pull/17008/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17008

View PR using the GUI difftool:
$ git pr show -t 17008

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17008.diff

Webrev

Link to Webrev Comment

The comparison should be >= instead of >

bridgekeeper · 2023-12-06T23:32:57Z

👋 Welcome back rriggs! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-12-06T23:34:47Z

@RogerRiggs The following label will be automatically applied to this pull request:

core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-12-06T23:37:43Z

Webrevs

ExE-Boss · 2023-12-08T16:28:21Z

src/java.base/share/classes/java/lang/StringUTF16.java

            throw new OutOfMemoryError("UTF16 String size is " + len +
-                                       ", should be less than " + MAX_LENGTH);
+                                       ", should be less than or equal to " + MAX_LENGTH);


Suggested change

", should be less than or equal to " + MAX_LENGTH);

", should be less than " + MAX_LENGTH);

I second @ExE-Boss's comment.

Need to recheck.

Correct exception message text Removed unused imports

rgiulietti · 2023-12-08T20:20:49Z

test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java

+        byte[] nonAscii = "\u0100".getBytes();
+        int nonAsciiSize = nonAscii.length;
+        int asciisize = byteSize - nonAsciiSize;
+        byte[] arr = new byte[asciisize + nonAsciiSize];


Suggested change

byte[] arr = new byte[asciisize + nonAsciiSize];

byte[] arr = new byte[byteSize];

Note that asciisize + nonAsciiSize = byteSize - nonAsciiSize + nonAsciiSize = byteSize, even in the presence of overflows. Then asciisize becomes useless.

rgiulietti · 2023-12-08T20:21:01Z

test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java

+        int nonAsciiSize = nonAscii.length;
+        int asciisize = byteSize - nonAsciiSize;
+        byte[] arr = new byte[asciisize + nonAsciiSize];
+        Arrays.fill(arr, (byte)'x');      // fill with latin1


(byte) 0 is a valid UTF-8 sequence after all, so there is no need to fill the array with 'x'.

rgiulietti · 2023-12-08T20:21:11Z

test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java

+        char[] nonAscii = "\u0100".toCharArray();
+        int nonAsciiSize = nonAscii.length;
+        int asciisize = size - nonAsciiSize;
+        char[] arr = new char[asciisize + nonAsciiSize];


Same as above

rgiulietti · 2023-12-08T20:21:14Z

test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java

+        int nonAsciiSize = nonAscii.length;
+        int asciisize = size - nonAsciiSize;
+        char[] arr = new char[asciisize + nonAsciiSize];
+        Arrays.fill(arr, 'x');      // fill with latin1


Same as above

rgiulietti · 2023-12-09T16:39:32Z

LGTM

openjdk · 2023-12-09T16:41:40Z

@RogerRiggs This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8321180: Condition for non-latin1 string size too large exception is off by one

Reviewed-by: rgiulietti

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 43 new commits pushed to the master branch:

ce10844: 8319577: x86_64 AVX2 intrinsics for Arrays.sort methods (int, float arrays)
5c12a18: 8320790: Update --release 22 symbol information for JDK 22 build 27
7180088: 8321429: (fc) FileChannel.lock creates a FileKey containing two long index values, they could be stored as int values
0c178be: 8321206: Make Locale related system properties StaticProperty
6c13a30: 8312307: Obsoleted code in hb-jdk-font.cc
5e6bfc5: 8321539: Minimal build is broken by JDK-8320935
2c2d4d2: 8321485: remove serviceability/attach/ConcAttachTest.java from problemlist on macosx
0eb299a: 8316141: Improve CEN header validation checking
b893a2b: 8321597: Use .template consistently for files treated as templates by the build
05f9509: 8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll
... and 33 more: https://git.openjdk.org/jdk/compare/91ffdfb1fcacbb95b93491d412e506695198946e...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

RogerRiggs · 2023-12-12T20:53:26Z

/integrate

openjdk · 2023-12-12T20:55:20Z

Going to push as commit 4fb5c12.
Since your change was applied there have been 65 commits pushed to the master branch:

d5a96e3: 8321621: Update JCov version to 3.0.16
aadf368: 6230751: [Fmt-Ch] Recursive MessageFormats in ChoiceFormats ignore indicated subformats
a3447ec: 8321827: Remove unnecessary suppress warnings annotations from the printing processor
b25ed57: 8270269: Desktop.browse method fails if earlier CoInitialize call as COINIT_MULTITHREADED
df4ed7e: 8321739: Source launcher fails with "Not a directory" error
5718039: 8321542: C2: Missing ChaCha20 stub for x86_32 leads to crashes
c516852: 8321889: JavaDoc method references with wrong (nested) type
7d90396: 8321422: Test gc/g1/pinnedobjs/TestPinnedObjectTypes.java times out after completion
6f48240: 8321729: Remove 'orb' field in RMIConnector
e1fd663: 8311306: Test com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java failed: out of expected range
... and 55 more: https://git.openjdk.org/jdk/compare/91ffdfb1fcacbb95b93491d412e506695198946e...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-12-12T20:55:26Z

@RogerRiggs Pushed as commit 4fb5c12.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

8321180: Condition for non-latin1 string size too large is off by one

f2de15a

The comparison should be >= instead of >

openjdk bot added the rfr Pull request is ready for review label Dec 6, 2023

openjdk bot added the core-libs core-libs-dev@openjdk.org label Dec 6, 2023

ExE-Boss reviewed Dec 8, 2023

View reviewed changes

As suggested by reviewers

2f03e1f

Correct exception message text Removed unused imports

rgiulietti reviewed Dec 8, 2023

View reviewed changes

Simplify and clarify test data array creation

24b7696

rgiulietti approved these changes Dec 9, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 9, 2023

openjdk bot added the integrated Pull request has been integrated label Dec 12, 2023

openjdk bot closed this Dec 12, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 12, 2023

RogerRiggs deleted the 8321180-utf16-greater-equal branch November 27, 2024 16:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8321180: Condition for non-latin1 string size too large exception is off by one #17008

8321180: Condition for non-latin1 string size too large exception is off by one #17008

Uh oh!

RogerRiggs commented Dec 6, 2023 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Dec 6, 2023

Uh oh!

openjdk bot commented Dec 6, 2023

Uh oh!

mlbridge bot commented Dec 6, 2023 •

edited

Loading

Uh oh!

ExE-Boss Dec 8, 2023

Uh oh!

rgiulietti Dec 8, 2023

Uh oh!

RogerRiggs Dec 8, 2023 •

edited

Loading

Uh oh!

rgiulietti Dec 8, 2023

Uh oh!

rgiulietti Dec 8, 2023

Uh oh!

rgiulietti Dec 8, 2023

Uh oh!

rgiulietti Dec 8, 2023

Uh oh!

rgiulietti commented Dec 9, 2023

Uh oh!

openjdk bot commented Dec 9, 2023

Uh oh!

RogerRiggs commented Dec 12, 2023

Uh oh!

openjdk bot commented Dec 12, 2023

Uh oh!

openjdk bot commented Dec 12, 2023

Uh oh!

Uh oh!

	", should be less than or equal to " + MAX_LENGTH);
	", should be less than " + MAX_LENGTH);

	byte[] arr = new byte[asciisize + nonAsciiSize];
	byte[] arr = new byte[byteSize];

8321180: Condition for non-latin1 string size too large exception is off by one #17008

8321180: Condition for non-latin1 string size too large exception is off by one #17008

Uh oh!

Conversation

RogerRiggs commented Dec 6, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Dec 6, 2023

Uh oh!

openjdk bot commented Dec 6, 2023

Uh oh!

mlbridge bot commented Dec 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

ExE-Boss Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

rgiulietti Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

RogerRiggs Dec 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rgiulietti Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

rgiulietti Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

rgiulietti Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

rgiulietti Dec 8, 2023

Choose a reason for hiding this comment

Uh oh!

rgiulietti commented Dec 9, 2023

Uh oh!

openjdk bot commented Dec 9, 2023

Uh oh!

RogerRiggs commented Dec 12, 2023

Uh oh!

openjdk bot commented Dec 12, 2023

Uh oh!

openjdk bot commented Dec 12, 2023

Uh oh!

Uh oh!

RogerRiggs commented Dec 6, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Dec 6, 2023 •

edited

Loading

RogerRiggs Dec 8, 2023 •

edited

Loading