8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA #23847

JoeWang-Java · 2025-02-28T17:42:24Z

Fix handleCharacters by adding a guard to zero length and letting the rest of the process continue (e.g. closing tags and etc).

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-8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA (Bug - P4)

Reviewers

Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23847

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-02-28T17:42:55Z

👋 Welcome back joehw! 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 · 2025-02-28T17:43:29Z

@JoeWang-Java 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:

8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA

Reviewed-by: naoto

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 33 new commits pushed to the master branch:

99fb350: 8350654: (fs) Files.createTempDirectory should say something about the default file permissions when no file attributes specified
768b024: 8350682: [JMH] vector.IndexInRangeBenchmark failed with IndexOutOfBoundsException for size=1024
c4b516d: 8348322: AOT cache creation crashes with "All cached hidden classes must be aot-linkable" when AOTInvokeDynamicLinking is disabled
e470f47: 8350095: RISC-V: Refactor string_compare
f53de92: 8350931: RISC-V: remove unnecessary src register for fp_sqrt_d/f
e1fc14f: 8350940: RISC-V: remove unnecessary assert_different_registers in minmax_fp
79880e5: 8351033: RISC-V: TestFloat16ScalarOperations asserts with offset (4210) is too large to be patched in one beq/bge/bgeu/blt/bltu/bne instruction!
bb70896: 8350903: Remove explicit libjvm.so dependency for libVThreadEventTest
7c187b5: 8338737: Shenandoah: Reset marking bitmaps after the cycle
3602c8c: 8350955: Fix repetitions of the word "the" in runtime component comments
... and 23 more: https://git.openjdk.org/jdk/compare/e98df71d9c5120fbb73a4c2f49863775fe5db781...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.

openjdk · 2025-02-28T17:44:08Z

@JoeWang-Java 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 · 2025-02-28T17:47:42Z

Webrevs

naotoj · 2025-02-28T22:33:14Z

src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java

+        if (textLength > 0) {
+            staxStreamReader.getTextCharacters(0, chars, 0, textLength);
+        }


Hi Joe,
The comment above this piece reads:

// workaround for bugid 5046319 - switch over to commented section // below when it is fixed.

And the bug 5046319 (closed issue about AIOOBE) is fixed. Should the commented section be considered?

Hi Naoto,

Yes, I did look through that code and bug 5046319. Unfortunately, it happened when JAXP was standalone, the history of the change was lost.
The variable "buf" seems to be an instance variable that serves to cache the text read. That part had been changed as well. Furthermore, if buf starts with zero length, the call to getTextCharacters would still result in IndexOutOfBoundsException.

Maybe the commented code can be removed, I kept them as is in case they may be useful reference as a history.

OK, then I'd suggest removing the above comment and commented section altogether, as it only provides confusion.

Yeah, agree. The code is stable as is.

naotoj · 2025-03-03T18:01:48Z

test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java

+     * @throws Exception if the test fails, in which case the parser throws
+     * IndexOutOfBoundsException.


Do we need this throws Exception clause (and the method declaration below)? Since AIOOBE is a RuntimeException, this throws clause does not seem to be necessary. Simple description of the failure case may suffice.

Thanks Naoto. Improved the javadoc a bit.

naotoj

Looks good. Thanks for the update

JoeWang-Java · 2025-03-04T03:48:51Z

/integrate

openjdk · 2025-03-04T03:49:20Z

Going to push as commit 96613cc.
Since your change was applied there have been 34 commits pushed to the master branch:

3a8a432: 8349094: GenShen: Race between control and regulator threads may violate assertions
99fb350: 8350654: (fs) Files.createTempDirectory should say something about the default file permissions when no file attributes specified
768b024: 8350682: [JMH] vector.IndexInRangeBenchmark failed with IndexOutOfBoundsException for size=1024
c4b516d: 8348322: AOT cache creation crashes with "All cached hidden classes must be aot-linkable" when AOTInvokeDynamicLinking is disabled
e470f47: 8350095: RISC-V: Refactor string_compare
f53de92: 8350931: RISC-V: remove unnecessary src register for fp_sqrt_d/f
e1fc14f: 8350940: RISC-V: remove unnecessary assert_different_registers in minmax_fp
79880e5: 8351033: RISC-V: TestFloat16ScalarOperations asserts with offset (4210) is too large to be patched in one beq/bge/bgeu/blt/bltu/bne instruction!
bb70896: 8350903: Remove explicit libjvm.so dependency for libVThreadEventTest
7c187b5: 8338737: Shenandoah: Reset marking bitmaps after the cycle
... and 24 more: https://git.openjdk.org/jdk/compare/e98df71d9c5120fbb73a4c2f49863775fe5db781...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-03-04T03:49:26Z

@JoeWang-Java Pushed as commit 96613cc.

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

8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA

70fc2ca

openjdk bot added the rfr Pull request is ready for review label Feb 28, 2025

openjdk bot added the core-libs core-libs-dev@openjdk.org label Feb 28, 2025

naotoj reviewed Feb 28, 2025

View reviewed changes

remove commented section

2d4b765

naotoj reviewed Mar 3, 2025

View reviewed changes

improve the javadoc for the test

c8f0712

naotoj approved these changes Mar 3, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 3, 2025

openjdk bot added the integrated Pull request has been integrated label Mar 4, 2025

openjdk bot closed this Mar 4, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 4, 2025

JoeWang-Java deleted the JDK-8349516 branch March 4, 2025 04:49

		* @throws Exception if the test fails, in which case the parser throws
		* IndexOutOfBoundsException.

8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA #23847

8349516: StAXStream2SAX.handleCharacters() fails on empty CDATA #23847

Uh oh!

Conversation

JoeWang-Java commented Feb 28, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Feb 28, 2025

Uh oh!

openjdk bot commented Feb 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Feb 28, 2025

Uh oh!

mlbridge bot commented Feb 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

naotoj Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

naotoj Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java Mar 1, 2025

Choose a reason for hiding this comment

Uh oh!

naotoj Mar 3, 2025

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java Mar 3, 2025

Choose a reason for hiding this comment

Uh oh!

naotoj left a comment

Choose a reason for hiding this comment

Uh oh!

JoeWang-Java commented Mar 4, 2025

Uh oh!

openjdk bot commented Mar 4, 2025

Uh oh!

openjdk bot commented Mar 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

JoeWang-Java commented Feb 28, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Feb 28, 2025 •

edited

Loading

mlbridge bot commented Feb 28, 2025 •

edited

Loading