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

8278794: Infinite loop in DeflaterOutputStream.finish() #975

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 1, 2022

I backport this for parity with 11.0.16-oracle.

I had to resolve 3 copyrights, the rest applied clean. Marking as clean.


Progress

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

Issue

  • JDK-8278794: Infinite loop in DeflaterOutputStream.finish()

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 975

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 1, 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 66c35298616cd23382b1a1fe1afeb90b1d0c0222 8278794: Infinite loop in DeflaterOutputStream.finish() Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 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 Apr 1, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Apr 1, 2022

/clean

@openjdk openjdk bot added the clean label Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

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

8278794: Infinite loop in DeflaterOutputStream.finish()

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Apr 1, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 1, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Apr 5, 2022

Pre-submit failurte: cygwin missing, unrelated.

@GoeLin
Copy link
Member Author

GoeLin commented Apr 5, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2022

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

  • 9ce8530: 8279219: [REDO] C2 crash when allocating array of size too large
  • 31cbb82: 8245543: Cgroups: Incorrect detection logic on some systems (still reproducible)
  • 7f8a11b: 8280867: Cpuid1Ecx feature parsing is incorrect for AMD CPUs
  • fee03ea: 8275337: C1: assert(false) failed: live_in set of first block must be empty
  • 132c6c4: 8277093: Vector should throw ClassNotFoundException for a missing class of an element
  • a852ad1: 8272358: Some tests may fail when executed with other locales than the US
  • b08aae1: 8272908: Missing coverage for certain classes in com.sun.org.apache.xml.internal.security
  • 708017c: 8272964: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • 1b940f3: 8256146: Cleanup test/jdk/java/nio/channels/DatagramChannel/Connect.java
  • cd591e4: 8254887: C2: assert(cl->trip_count() > 0) failed: peeling a fully unrolled loop
  • ... and 21 more: https://git.openjdk.java.net/jdk11u-dev/compare/0182066bacc35bd015ebd925b0e0fe45b9e3b276...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 5, 2022

@GoeLin Pushed as commit 11196c4.

💡 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_8278794 branch April 5, 2022 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant