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

8321131: Console read line with zero out should zero out underlying buffer in JLine #33

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 14, 2023

A fix we should have in 21.
I had to resolve one place due to context, it will probably be recognized as clean.


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
  • JDK-8321131 needs maintainer approval

Issue

  • JDK-8321131: Console read line with zero out should zero out underlying buffer in JLine (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/33/head:pull/33
$ git checkout pull/33

Update a local copy of the PR:
$ git checkout pull/33
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/33/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 33

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/33.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 14, 2023

👋 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 bd04f91e9103ee04f643f8d04553705c4d78fda3 8321131: Console read line with zero out should zero out underlying buffer in JLine Dec 14, 2023
@openjdk
Copy link

openjdk bot commented Dec 14, 2023

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

@openjdk openjdk bot added the backport label Dec 14, 2023
@openjdk
Copy link

openjdk bot commented Dec 14, 2023

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 14, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 14, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 15, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@GoeLin
Copy link
Member Author

GoeLin commented Dec 15, 2023

GHA failure: TestAllocHumongousFragment_aggressive.d failed with java.lang.OutOfMemoryError: Java heap space
I see this the third time now in the past two days of 21u-dev. Unrelated.

@openjdk openjdk bot added the approval label Dec 15, 2023
@openjdk
Copy link

openjdk bot commented Dec 15, 2023

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

8321131: Console read line with zero out should zero out underlying buffer in JLine

Reviewed-by: mbaesken

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 1 new commit pushed to the master branch:

  • 63aecc5: 8320300: Adjust hs_err output in malloc/mmap error cases

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 ready Pull request is ready to be integrated and removed approval labels Dec 15, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Dec 16, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2023

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

  • db343c9: 8314612: TestUnorderedReduction.java fails with -XX:MaxVectorSize=32 and -XX:+AlignVector
  • 63aecc5: 8320300: Adjust hs_err output in malloc/mmap error cases

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 16, 2023
@openjdk openjdk bot closed this Dec 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 16, 2023
@openjdk
Copy link

openjdk bot commented Dec 16, 2023

@GoeLin Pushed as commit fccb0a1.

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

@GoeLin GoeLin deleted the goetz_backport_8321131 branch December 16, 2023 10:40
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
2 participants