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

8282134: Certain regex can cause a JS trap in WebView #739

Closed
wants to merge 1 commit into from

Conversation

jaybhaskar
Copy link
Member

@jaybhaskar jaybhaskar commented Feb 19, 2022

Fix YarrJIT backtrackCharacterClassNonGreedy breakpoint() Certain regex can cause a JS trap in WebView


Progress

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

Issue

  • JDK-8282134: Certain regex can cause a JS trap in WebView

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/739/head:pull/739
$ git checkout pull/739

Update a local copy of the PR:
$ git checkout pull/739
$ git pull https://git.openjdk.java.net/jfx pull/739/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 739

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/739.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 19, 2022

👋 Welcome back jaybhaskar! 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 added the rfr Ready for review label Feb 19, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 19, 2022

Webrevs

@kevinrushforth
Copy link
Member

/reviewers 2

@openjdk
Copy link

openjdk bot commented Feb 19, 2022

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

The fix looks good. I confirm that the new test fails without the fix and passes with the fix.

@openjdk
Copy link

openjdk bot commented Feb 22, 2022

⚠️ @jaybhaskar the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout public-sec-bug
$ git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Feb 22, 2022

@jaybhaskar 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:

8282134: Certain regex can cause a JS trap in WebView

Reviewed-by: kcr, arapte

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

  • 418d343: 8281711: Cherry-pick WebKit 613.1 stabilization fixes
  • 2561e31: Merge
  • 8b879ee: 8271085: TabPane: Redundant API docs
  • ed39982: 8279345: Realign class docs of LightBase and subclasses
  • 6b7b463: 8280841: Update SQLite to 3.37.2
  • cdebc6c: 8281459: WebKit 613.1 build broken on M1
  • 4cf66d9: 8187309: TreeCell must not change tree's data
  • 590033f: 8273336: Clicking a selected cell from a group of selected cells in a TableView clears the selected items list but remains selected
  • f326e78: 8277572: ImageStorage should correctly handle MIME types for images encoded in data URIs

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@kevinrushforth, @arapte) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Ready to be integrated label Feb 22, 2022
@openjdk
Copy link

openjdk bot commented Feb 22, 2022

⚠️ @jaybhaskar This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot removed the ready Ready to be integrated label Feb 22, 2022
@jaybhaskar
Copy link
Member Author

git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
command error out as below

fatal: Option -m cannot be combined with -c/-C/-F.

@jaybhaskar
Copy link
Member Author

Author name Change , due to bot comment

⚠️ @jaybhaskar the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout public-sec-bug
$ git commit -c user.name='Preferred Full Name' --allow-empty -m 'Update full name'
$ git push

@kevinrushforth
Copy link
Member

In general, we prefer that you not force push your branch once the associated PR is under review. In this case, it seems that an incorrect Skara message led you to amend the existing commit, rather than adding a new empty commit as intended. I'll file a bug against Skara.

@openjdk openjdk bot added the ready Ready to be integrated label Feb 22, 2022
@jaybhaskar
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Ready to sponsor label Feb 22, 2022
@openjdk
Copy link

openjdk bot commented Feb 22, 2022

@jaybhaskar
Your change (at version 3fad1fc) is now ready to be sponsored by a Committer.

@kevinrushforth
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 22, 2022

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

  • 418d343: 8281711: Cherry-pick WebKit 613.1 stabilization fixes
  • 2561e31: Merge
  • 8b879ee: 8271085: TabPane: Redundant API docs
  • ed39982: 8279345: Realign class docs of LightBase and subclasses
  • 6b7b463: 8280841: Update SQLite to 3.37.2
  • cdebc6c: 8281459: WebKit 613.1 build broken on M1
  • 4cf66d9: 8187309: TreeCell must not change tree's data
  • 590033f: 8273336: Clicking a selected cell from a group of selected cells in a TableView clears the selected items list but remains selected
  • f326e78: 8277572: ImageStorage should correctly handle MIME types for images encoded in data URIs

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 22, 2022
@openjdk openjdk bot closed this Feb 22, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review sponsor Ready to sponsor labels Feb 22, 2022
@openjdk
Copy link

openjdk bot commented Feb 22, 2022

@kevinrushforth @jaybhaskar Pushed as commit 7396396.

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

@jaybhaskar jaybhaskar deleted the public-sec-bug branch March 4, 2023 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
3 participants