Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8278186: org.jcp.xml.dsig.internal.dom.Utils.parseIdFromSameDocumentURI throws StringIndexOutOfBoundsException when calling substring method #909

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 17, 2022

I backport this for parity with 11.0.16-oracle.

The change applies clean, but the new test requires XMLUtils.java.
I include XMLUtils.java, which was introduced by
"8241306: Add SignatureMethodParameterSpec subclass for RSASSA-PSS params"".
I had to adapt a row on non Java 11 constructs.
Also, I commented references to RSAPSSParameterSpec and
and SignatureMethod.RSA_PSS which only come with 8241306.
The code is not used by this test. I added an exception
to make sure the code is not executed.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8278186: org.jcp.xml.dsig.internal.dom.Utils.parseIdFromSameDocumentURI throws StringIndexOutOfBoundsException when calling substring method

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/909/head:pull/909
$ git checkout pull/909

Update a local copy of the PR:
$ git checkout pull/909
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/909/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 909

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/909.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport 1f1db838ab7d427170d59a8b55fdb45c4d80c359 8278186: org.jcp.xml.dsig.internal.dom.Utils.parseIdFromSameDocumentURI throws StringIndexOutOfBoundsException when calling substring method Mar 17, 2022
@openjdk
Copy link

openjdk bot commented Mar 17, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 17, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

Pre-submit failure: infrastructure problem: Error: Internal Server Error. Internal Server Error

@TheRealMDoerr
Copy link
Contributor

For reference: XMLUtils.java was taken from openjdk/jdk@8dbf7aa

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adaptations for 11u look correct.

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

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

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

8278186: org.jcp.xml.dsig.internal.dom.Utils.parseIdFromSameDocumentURI throws StringIndexOutOfBoundsException when calling substring method

Reviewed-by: mdoerr

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

  • dbd14f7: 8277422: tools/jar/JarEntryTime.java fails with modified time mismatch
  • dfcef29: 8241707: introduce randomness k/w to hotspot test suite
  • b42dd74: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
  • 73dc222: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
  • 6135540: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 9543488: 8247592: refactor test/jdk/tools/launcher/Test7029048.java
  • 62afe2e: 8166727: javac crashed: [jimage.dll+0x1942] ImageStrings::find+0x28
  • e1b2f92: 8279356: Method linking fails with guarantee(mh->adapter() != NULL) failed: Adapter blob must already exist!

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 openjdk bot added the ready Pull request is ready to be integrated label Mar 18, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 18, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 18, 2022

Going to push as commit 63db1bf.
Since your change was applied there have been 12 commits pushed to the master branch:

  • a3af00c: 8274233: Minor cleanup for ToolBox
  • 269114b: 8269933: test/jdk/javax/net/ssl/compatibility/JdkInfo incorrect verification of protocol and cipher support
  • d267171: 8231489: GC watermark_0_1 failed due to "metaspace.gc.Fault: GC has happened too rare"
  • 306d863: 8229486: Replace wildcard address with loopback or local host in tests - part 21
  • dbd14f7: 8277422: tools/jar/JarEntryTime.java fails with modified time mismatch
  • dfcef29: 8241707: introduce randomness k/w to hotspot test suite
  • b42dd74: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
  • 73dc222: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
  • 6135540: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 9543488: 8247592: refactor test/jdk/tools/launcher/Test7029048.java
  • ... and 2 more: https://git.openjdk.java.net/jdk11u-dev/compare/38e44eb552c6ebaa75310babb920b72f80deba90...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 18, 2022
@openjdk openjdk bot closed this Mar 18, 2022
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Mar 18, 2022
@GoeLin GoeLin deleted the goetz_backport_8278186 branch March 18, 2022 12:36
@openjdk openjdk bot removed the rfr Pull request is ready for review label Mar 18, 2022
@openjdk
Copy link

openjdk bot commented Mar 18, 2022

@GoeLin Pushed as commit 63db1bf.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants