stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8023431: Test java/util/zip/GZIP/GZIPInZip.java failed

Browse Source 
Properly close PipedStreams. Additional testing for malformed input

Reviewed-by: darcy, sherman
This commit is contained in:
Ivan Gerasimov 2013-10-15 21:15:17 +04:00
parent 45dc5dd0df
commit 71f3325481
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
jdk/test/java/util/zip/GZIP/GZIPInZip.java
View File

@ -22,12 +22,15 @@
*/ */
/* @test /* @test
* @bug 7021870 * @bug 7021870 8023431
* @summary Reading last gzip chain member must not close the input stream * @summary Reading last gzip chain member must not close the input stream.
* Garbage following gzip entry must be ignored.
*/ */
import java.io.*; import java.io.IOException;
import java.util.*; import java.io.InputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@ -40,6 +43,15 @@ public class GZIPInZip {
private static volatile Throwable trouble; private static volatile Throwable trouble;
public static void main(String[] args) throws Throwable { public static void main(String[] args) throws Throwable {
doTest(false, false);
doTest(false, true);
doTest(true, false);
doTest(true, true);
}
private static void doTest(final boolean appendGarbage,
final boolean limitGISBuff)
throws Throwable {
final PipedOutputStream pos = new PipedOutputStream(); final PipedOutputStream pos = new PipedOutputStream();
final PipedInputStream pis = new PipedInputStream(pos); final PipedInputStream pis = new PipedInputStream(pos);
@ -47,17 +59,23 @@ public class GZIPInZip {
Thread compressor = new Thread() { Thread compressor = new Thread() {
public void run() { public void run() {
final byte[] xbuf = { 'x' }; final byte[] xbuf = { 'x' };
try { try (ZipOutputStream zos = new ZipOutputStream(pos)) {
ZipOutputStream zos = new ZipOutputStream(pos);
zos.putNextEntry(new ZipEntry("a.gz")); zos.putNextEntry(new ZipEntry("a.gz"));
GZIPOutputStream gos1 = new GZIPOutputStream(zos); try (GZIPOutputStream gos1 = new GZIPOutputStream(zos)) {
gos1.write(xbuf); gos1.finish(); gos1.write(xbuf);
gos1.finish();
}
if (appendGarbage)
zos.write(xbuf);
zos.closeEntry(); zos.closeEntry();
zos.putNextEntry(new ZipEntry("b.gz")); zos.putNextEntry(new ZipEntry("b.gz"));
GZIPOutputStream gos2 = new GZIPOutputStream(zos); try (GZIPOutputStream gos2 = new GZIPOutputStream(zos)) {
gos2.write(xbuf); gos2.finish(); gos2.write(xbuf);
gos2.finish();
}
zos.closeEntry(); zos.closeEntry();
} catch (Throwable t) { } catch (Throwable t) {
@ -68,19 +86,20 @@ public class GZIPInZip {
Thread uncompressor = new Thread() { Thread uncompressor = new Thread() {
public void run() { public void run() {
try { try (ZipInputStream zis = new ZipInputStream(pis)) {
ZipInputStream zis = new ZipInputStream(pis);
zis.getNextEntry(); zis.getNextEntry();
InputStream gis = new GZIPInputStream(zis); try (InputStream gis = limitGISBuff ?
new GZIPInputStream(zis, 4) :
new GZIPInputStream(zis)) {
// try to read more than the entry has // try to read more than the entry has
gis.skip(2); gis.skip(2);
}
try { try {
zis.getNextEntry(); zis.getNextEntry();
} catch (IOException e) { } catch (IOException e) {
throw new AssertionError("ZIP stream was prematurely closed"); throw new AssertionError("ZIP stream was prematurely closed");
} }
} catch (Throwable t) { } catch (Throwable t) {
trouble = t; trouble = t;
} }