archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8253952: Refine ZipOutputStream.putNextEntry() to recalculate ZipEntry's compressed size

Browse source 
Reviewed-by: lancea, alanb
This commit is contained in:
Volker Simonis 2020-10-15 09:18:26 +00:00
parent 9359ff03ae
commit 60159cff40
4 changed files with 231 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/share/classes/java/util/jar/JarOutputStream.java
View file

@ -76,8 +76,15 @@ public class JarOutputStream extends ZipOutputStream {
/**
* Begins writing a new JAR file entry and positions the stream
* to the start of the entry data. This method will also close
* any previous entry. The default compression method will be
* used if no compression method was specified for the entry.
* any previous entry.
* <p>
* The default compression method will be used if no compression
* method was specified for the entry. When writing a compressed
* (DEFLATED) entry, and the compressed size has not been explicitly
* set with the {@link ZipEntry#setCompressedSize(long)} method,
* then the compressed size will be set to the actual compressed
* size after deflation.
* <p>
* The current time will be used if the entry has no set modification
* time.
*

4
src/java.base/share/classes/java/util/zip/ZipEntry.java
View file

@ -53,6 +53,8 @@ public class ZipEntry implements ZipConstants, Cloneable {
long crc = -1; // crc-32 of entry data
long size = -1; // uncompressed size of entry data
long csize = -1; // compressed size of entry data
boolean csizeSet = false; // Only true if csize was explicitely set by
// a call to setCompressedSize()
int method = -1; // compression method
int flag = 0; // general purpose flag
byte[] extra; // optional extra field data for entry
@ -127,6 +129,7 @@ public class ZipEntry implements ZipConstants, Cloneable {
crc = e.crc;
size = e.size;
csize = e.csize;
csizeSet = e.csizeSet;
method = e.method;
flag = e.flag;
extra = e.extra;
@ -447,6 +450,7 @@ public class ZipEntry implements ZipConstants, Cloneable {
*/
public void setCompressedSize(long csize) {
this.csize = csize;
this.csizeSet = true;
}
/**

21
src/java.base/share/classes/java/util/zip/ZipOutputStream.java
View file

@ -179,9 +179,15 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
/**
* Begins writing a new ZIP file entry and positions the stream to the
* start of the entry data. Closes the current entry if still active.
* <p>
* The default compression method will be used if no compression method
* was specified for the entry, and the current time will be used if
* the entry has no set modification time.
* was specified for the entry. When writing a compressed (DEFLATED)
* entry, and the compressed size has not been explicitly set with the
* {@link ZipEntry#setCompressedSize(long)} method, then the compressed
* size will be set to the actual compressed size after deflation.
* <p>
* The current time will be used if the entry has no set modification time.
*
* @param e the ZIP entry to be written
* @throws ZipException if a ZIP format error has occurred
* @throws IOException if an I/O error has occurred
@ -203,11 +209,14 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
e.flag = 0;
switch (e.method) {
case DEFLATED:
// store size, compressed size, and crc-32 in data descriptor
// immediately following the compressed entry data
if (e.size == -1 || e.csize == -1 || e.crc == -1)
// If not set, store size, compressed size, and crc-32 in data
// descriptor immediately following the compressed entry data.
// Ignore the compressed size of a ZipEntry if it was implcitely set
// while reading that ZipEntry from a ZipFile or ZipInputStream because
// we can't know the compression level of the source zip file/stream.
if (e.size == -1 || e.csize == -1 || e.crc == -1 || !e.csizeSet) {
e.flag = 8;
}
break;
case STORED:
// compressed size, uncompressed size, and crc-32 must all be