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

8193682: Infinite loop in ZipOutputStream.close() #147

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link

@jmtd jmtd commented Feb 4, 2022

Hi

This pull request contains a backport of commit 1e9ed54d from the openjdk/jdk repository.

The commit being backported was authored by Ravi Reddy on 1 Dec 2021 and was reviewed by Lance Andersen and Sean Coffey.

This is a backport for Oracle parity. The patch introduces a new test for the bug. The test fails against jdk17u-dev master prior to the patch and passes afterwards.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires a CSR request to be approved

Issues

  • JDK-8193682: Infinite loop in ZipOutputStream.close()
  • JDK-8276305: Infinite loop in ZipOutputStream.close() (CSR)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 147

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 4, 2022

👋 Welcome back jdowland! 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 1e9ed54d362b8c57be5fbbac2de5afbd0f05435f 8193682: Infinite loop in ZipOutputStream.close() Feb 4, 2022
@openjdk
Copy link

openjdk bot commented Feb 4, 2022

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

@openjdk
Copy link

openjdk bot commented Feb 4, 2022

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

8193682: Infinite loop in ZipOutputStream.close()

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

  • 5c8ce90: 8280956: Re-examine copyright headers on files in src/java.desktop/macosx/native/libawt_lwawt/awt/a11y
  • f2329d5: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 049b1ba: 8280401: [sspi] gss_accept_sec_context leaves output_token uninitialized
  • 7650afa: 8279227: Access Bridge: Wrong frame position and hit test result on HiDPI display
  • a605a30: 8277087: ZipException: zip END header not found at ZipFile#Source.findEND
  • cbe4973: 8278851: Correct signer logic for jars signed with multiple digestalgs
  • 32148d2: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • fbe05ec: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
  • 90126f8: 8214733: runtime/8176717/TestInheritFD.java timed out
  • 00f201d: 8279437: [JVMCI] exception in HotSpotJVMCIRuntime.translate can exit the VM
  • ... and 108 more: https://git.openjdk.java.net/jdk17u-dev/compare/dba064ae107120109f792909475810afde7705e8...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 ready rfr labels Feb 4, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 4, 2022

Webrevs

@zhengyu123
Copy link
Contributor

zhengyu123 commented Feb 7, 2022

@jmtd This is a clean backport, you don't need code review. Please tag the bug for approval.

@jmtd
Copy link
Author

jmtd commented Feb 7, 2022

@zhengyu123 thank you for your reply! I meant to get back to this one today. It is clean, but the original bug needed a CSR, so I believe I need to raise a CSR for the backport too. I just didn't get around to looking into that yet. Am I right?

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 8, 2022

@jmtd This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@GoeLin
Copy link
Member

GoeLin commented Mar 17, 2022

@jmtd, I'll handle this.

@GoeLin
Copy link
Member

GoeLin commented Mar 19, 2022

I tested the PR agains the current jdk17-dev. All green.

@GoeLin
Copy link
Member

GoeLin commented Mar 20, 2022

@jmtd, this is all ready now, could you please integrate the PR?

@jmtd
Copy link
Author

jmtd commented Mar 22, 2022

/integrate

@openjdk openjdk bot added the sponsor label Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

@jmtd
Your change (at version 9acb20f) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Mar 22, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 22, 2022

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

  • 937b55c: 8282583: Update BCEL md to include the copyright notice
  • a7efcca: 8277922: Unable to click JCheckBox in JTable through Java Access Bridge
  • 9bfb322: 8249592: Robot.mouseMove moves cursor to incorrect location when display scale varies and Java runs in DPI Unaware mode
  • a637773: 8282295: SymbolPropertyEntry::set_method_type fails with assert
  • aafda8c: 8281275: Upgrading from 8 to 11 no longer accepts '/' as filepath separator in gc paths
  • bd360ab: 8281262: Windows builds in different directories are not fully reproducible
  • ea167d7: 8278472: Invalid value set to CANDIDATEFORM structure
  • 5c8ce90: 8280956: Re-examine copyright headers on files in src/java.desktop/macosx/native/libawt_lwawt/awt/a11y
  • f2329d5: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 049b1ba: 8280401: [sspi] gss_accept_sec_context leaves output_token uninitialized
  • ... and 115 more: https://git.openjdk.java.net/jdk17u-dev/compare/dba064ae107120109f792909475810afde7705e8...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 22, 2022
@openjdk openjdk bot closed this Mar 22, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Mar 22, 2022
@openjdk
Copy link

openjdk bot commented Mar 22, 2022

@GoeLin @jmtd Pushed as commit d19ec6f.

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

@jmtd
Copy link
Author

jmtd commented Mar 22, 2022

@GoeLin thank you for sorting out the CSR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
3 participants