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() #565

Closed
wants to merge 1 commit into from

Conversation

yan-too
Copy link
Contributor

@yan-too yan-too commented Aug 21, 2024

This is a second fix after "8193682: Infinite loop in ZipOutputStream.close()". Again, clean after 8193682 in code part, using jdk11 form as a prototype. The test added in the original fix had an issue fixed later in 8284771. Test is included in that fixed form. The issue 8284771 will be added to the commit message.


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

Issues

  • JDK-8278794: Infinite loop in DeflaterOutputStream.finish() (Bug - P4 - Approved)
  • JDK-8284771: java/util/zip/CloseInflaterDeflaterTest.java failed with "AssertionError: Expected IOException to be thrown, but nothing was thrown" (Bug - P2 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 565

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2024

👋 Welcome back yan! 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
Copy link

openjdk bot commented Aug 21, 2024

@yan-too 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()
8284771: java/util/zip/CloseInflaterDeflaterTest.java failed with "AssertionError: Expected IOException to be thrown, but nothing was thrown"

Reviewed-by: phh, sgehwolf

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

  • 89697c3: 8334653: ISO 4217 Amendment 177 Update
  • 9a426ad: 8318951: Additional negative value check in JPEG decoding
  • aa44346: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • fc33f51: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

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 changed the title Backport ff0b0927a2df8b36f8fd6ed41bd4e20e71a5b653 8278794: Infinite loop in DeflaterOutputStream.finish() Aug 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 21, 2024

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

@openjdk openjdk bot added the backport label Aug 21, 2024
@yan-too
Copy link
Contributor Author

yan-too commented Aug 21, 2024

/issue 8284771

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@yan-too
Adding additional issue to issue list: 8284771: java/util/zip/CloseInflaterDeflaterTest.java failed with "AssertionError: Expected IOException to be thrown, but nothing was thrown".

@mlbridge
Copy link

mlbridge bot commented Aug 21, 2024

Webrevs

@yan-too
Copy link
Contributor Author

yan-too commented Aug 21, 2024

Tests failures are unrelated: on macOS/hotspot it is again #544 it seems, and everything else is a certificate validation issue.

1 similar comment
@yan-too
Copy link
Contributor Author

yan-too commented Aug 21, 2024

Tests failures are unrelated: on macOS/hotspot it is again #544 it seems, and everything else is a certificate validation issue.

@yan-too yan-too closed this Aug 21, 2024
@yan-too yan-too reopened this Aug 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 23, 2024

⚠️ @yan-too 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.

@yan-too
Copy link
Contributor Author

yan-too commented Aug 26, 2024

/approval request I'm backporting this as a follow-up to 8193682. The backport was already done in Oracle jdk8 and all update releases before jdk18. Risk seems low. The fix to 8278794 substituted a new regtest which itself had to be fixed soon after in 8284771. The test is included in this updated form and 8284771 is added as a second issue to this commit.

@openjdk
Copy link

openjdk bot commented Aug 26, 2024

@yan-too
8278794: The approval request has been created successfully.
8284771: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Aug 26, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Aug 26, 2024

Tests failures are unrelated: on macOS/hotspot it is again #544 it seems, and everything else is a certificate validation issue.

Agreed.

/approve yes

@openjdk
Copy link

openjdk bot commented Aug 26, 2024

@jerboaa
8278794: The approval request has been approved.
8284771: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 26, 2024
@yan-too
Copy link
Contributor Author

yan-too commented Aug 26, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Aug 26, 2024

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

  • 89697c3: 8334653: ISO 4217 Amendment 177 Update
  • 9a426ad: 8318951: Additional negative value check in JPEG decoding
  • aa44346: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • fc33f51: 8266248: Compilation failure in PLATFORM_API_MacOSX_MidiUtils.c with Xcode 12.5

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 26, 2024

@yan-too Pushed as commit 4942516.

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

@yan-too yan-too deleted the bpZipFinish branch August 26, 2024 16:33
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.

3 participants