Skip to content

Conversation

@fitzsim
Copy link
Contributor

@fitzsim fitzsim commented Feb 15, 2024

Hello,

I am submitting this patch, written by Andrew John Hughes <andrew@openjdk.org>, which is a backport of:

commit 02b9452ed39eccdfe3210e65b17d4759333c0f15
Author: Xueming Shen <sherman@openjdk.org>
Date:   Wed Sep 20 16:41:54 2017 -0700

    8186464: ZipFile cannot read some InfoZip ZIP64 zip files
    
    Reviewed-by: martin

This patch was applied to the Red Hat 1.8.0 RPMs in June 2020, so it has been deployed to Red Hat customers for over three years.

I verified that the patch applies cleanly to jdk8u-dev master. I confirmed that with the fix portion of the patch reverted, the ReadZip.java test portion of the patch produces this exception:

java.lang.RuntimeException: zipfile: zip64 end failed
	at ReadZip.main(ReadZip.java:209)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.sun.javatest.regtest.agent.MainWrapper$MainThread.run(MainWrapper.java:127)
	at java.lang.Thread.run(Thread.java:750)

With the fix applied the test passes:

Passed: java/util/zip/ZipFile/ReadZip.java

With the patch applied on top of jdk8u-dev master tip, 3dc011b7ff955f6c1334058f300708412b21a3ad, make test on Fedora 38 x86-64 passes, with:

Test results: passed: 3,122

I also retested the test cases in https://bugs.openjdk.org/browse/JDK-8186464 and confirmed that without this backport, they fail, and with the backport they succeed.

Thank you,
Thomas


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-8186464 needs maintainer approval

Error

 ⚠️ OCA signatory status must be verified

Issue

  • JDK-8186464: ZipFile cannot read some InfoZip ZIP64 zip files (Bug - P3)

Contributors

  • Andrew John Hughes <andrew@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 445

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

Using diff file

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

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Feb 15, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 15, 2024

Hi @fitzsim, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user fitzsim" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk openjdk bot changed the title Backport 02b9452ed39eccdfe3210e65b17d4759333c0f15 8186464: ZipFile cannot read some InfoZip ZIP64 zip files Feb 15, 2024
@openjdk
Copy link

openjdk bot commented Feb 15, 2024

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Feb 15, 2024
@fitzsim
Copy link
Contributor Author

fitzsim commented Feb 15, 2024

I am contributing this work on behalf of my employer, Red Hat. /covered

@gnu-andrew
Copy link
Member

Windows x86 looks like the same issue as https://bugs.openjdk.org/browse/JDK-8324184
The definition of end64buf needs to be moved to the start of the block with the others.

@fitzsim
Copy link
Contributor Author

fitzsim commented Feb 16, 2024

/contributor add @gnu-andrew

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@fitzsim
Contributor Andrew John Hughes <andrew@openjdk.org> successfully added.

@fitzsim
Copy link
Contributor Author

fitzsim commented Feb 16, 2024

/contributor add @fitzsim

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@fitzsim @fitzsim was not found in the census.

Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

  • /contributor add @openjdk-bot
  • /contributor add duke
  • /contributor add J. Duke <duke@openjdk.org>

User names can only be used for users in the census associated with this repository. For other contributors you need to supply the full name and email address.

@fitzsim
Copy link
Contributor Author

fitzsim commented Feb 16, 2024

/author set @gnu-andrew

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@fitzsim Only Committers are allowed to issue the author command.

@gnu-andrew
Copy link
Member

/author set @gnu-andrew

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@gnu-andrew Only the pull request author (@fitzsim) is allowed to issue the author command.

@gnu-andrew
Copy link
Member

@fitzsim can we close this on in favour of #452 ?

@fitzsim
Copy link
Contributor Author

fitzsim commented Mar 11, 2024

Closing in favour of #452.

@fitzsim fitzsim closed this Mar 11, 2024
@bridgekeeper bridgekeeper bot removed the oca Needs verification of OCA signatory status label Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base

Development

Successfully merging this pull request may close these issues.

2 participants