RFR: 8303866: Allow ZipInputStream.readEnd to parse small Zip64 ZIP files [v6]

Eirik Bjorsnos duke at openjdk.org
Wed Nov 15 20:10:59 UTC 2023


On Mon, 13 Nov 2023 19:02:28 GMT, Lance Andersen <lancea at openjdk.org> wrote:

>> Eirik Bjorsnos has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Add a @bug reference in the test
>
> test/jdk/java/util/zip/ZipInputStream/Zip64DataDescriptor.java line 57:
> 
>> 55:     public void setup() {
>> 56:         /*
>> 57:          * Structure of the ZIP64 file used below . Note the precense
> 
> typo: **precense**

Thanks, fixed.

> test/jdk/java/util/zip/ZipInputStream/Zip64DataDescriptor.java line 63:
> 
>> 61:          * The file was produced using the following command:
>> 62:          * <pre>echo hello | zip -fd > hello.zip</pre>
>> 63:          *
> 
> Please document which zip command(and options) is being used by the above

Documented the zip command used (zip 3.0, by Info-ZIP), the use of stdin/streaming to enable Zip64, and the use of -fd to force the use of data descriptors.

> test/jdk/java/util/zip/ZipInputStream/Zip64DataDescriptor.java line 149:
> 
>> 147:      */
>> 148:     private void setExtraSize(short size) {
>> 149:         int extSizeOffset = 33;
> 
> I would suggest making this a constant.  Either way I would like to have a comment added indicating that the value represents of offset of the extra length size in the LOC Header for `zip64File` used by the test

Extracted the constant `ZIP64_BLOCK_SIZE_OFFSET` with a comment

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/12524#discussion_r1394736922
PR Review Comment: https://git.openjdk.org/jdk/pull/12524#discussion_r1394738124
PR Review Comment: https://git.openjdk.org/jdk/pull/12524#discussion_r1394737247


More information about the core-libs-dev mailing list