Skip to content
Permalink
Browse files
8277087: ZipException: zip END header not found at ZipFile#Source.fin…
…dEND

Reviewed-by: lancea
  • Loading branch information
mrserb committed Nov 23, 2021
1 parent 12f08ba commit e3243ee963d074c892a0ed16a00fd91b440c96ac
Showing 2 changed files with 117 additions and 3 deletions.
@@ -144,11 +144,14 @@ public ZipOutputStream(OutputStream out, Charset charset) {
* ZIP file comment is greater than 0xFFFF bytes
*/
public void setComment(String comment) {
byte[] bytes = null;
if (comment != null) {
this.comment = zc.getBytes(comment);
if (this.comment.length > 0xffff)
throw new IllegalArgumentException("ZIP file comment too long.");
bytes = zc.getBytes(comment);
if (bytes.length > 0xffff) {
throw new IllegalArgumentException("ZIP file comment too long");
}
}
this.comment = bytes;
}

/**
@@ -0,0 +1,111 @@
/*
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.io.ByteArrayOutputStream;
import java.util.function.Consumer;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;

import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import static org.testng.Assert.assertThrows;

/**
* @test
* @bug 8277087
* @summary Verifies various use cases when the zip comment should be empty
* @run testng EmptyComment
*/
public final class EmptyComment {

@DataProvider()
Object[][] longLengths() {
return new Object[][]{{0xFFFF + 1}, {0xFFFF + 2}, {0xFFFF * 2}};
}

/**
* Overflow, the text is too long to be stored as a comment.
*/
@Test(dataProvider = "longLengths")
void testOverflow(int length) throws Exception {
test(zos -> assertThrows(IllegalArgumentException.class, () -> {
zos.setComment("X".repeat(length));
}));
}

/**
* Simple cases where the comment is set to the empty text.
*/
@Test
void testSimpleCases() throws Exception {
test(zos -> {/* do nothing */});
test(zos -> zos.setComment(null));
test(zos -> zos.setComment(""));
test(zos -> {
zos.setComment("");
zos.setComment(null);
});
test(zos -> {
zos.setComment(null);
zos.setComment("");
});
test(zos -> {
zos.setComment("Comment");
zos.setComment(null);
});
test(zos -> {
zos.setComment("Comment");
zos.setComment("");
});
}

private static void test(Consumer<ZipOutputStream> test) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ZipOutputStream zos = new ZipOutputStream(baos)) {

test.accept(zos);

zos.putNextEntry(new ZipEntry("x"));
zos.finish();

byte[] data = baos.toByteArray();

if (data.length > 0xFFFF) { // just in case
throw new RuntimeException("data is too big: " + data.length);
}
int pk = data.length - ZipFile.ENDHDR;
if (data[pk] != 'P' || data[pk + 1] != 'K') {
throw new RuntimeException("PK is not found");
}
// Since the comment is empty this will be two last bytes
int pos = data.length - ZipFile.ENDHDR + ZipFile.ENDCOM;

int len = (data[pos] & 0xFF) + ((data[pos + 1] & 0xFF) << 8);
if (len != 0) {
throw new RuntimeException("zip comment is not empty: " + len);
}
}
}
}

3 comments on commit e3243ee

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on e3243ee Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e3243ee Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e3243ee Mar 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-e3243ee9 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Sergey Bylokhov on 23 Nov 2021 and was reviewed by Lance Andersen.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-e3243ee9:GoeLin-backport-e3243ee9
$ git checkout GoeLin-backport-e3243ee9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-e3243ee9

Please sign in to comment.