diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-03 16:23:31 -0700 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-12 00:14:46 +0100 |
| commit | 35d2187f72e95136574ead9323fb4fb7d4feb4dc (patch) | |
| tree | f4d5a62e4e69aec9943aadaae1921a69578099aa | |
| parent | ac16122816cc74ce1067b96f8d51612117d47b0c (diff) | |
| download | libcore-35d2187f72e95136574ead9323fb4fb7d4feb4dc.zip libcore-35d2187f72e95136574ead9323fb4fb7d4feb4dc.tar.gz libcore-35d2187f72e95136574ead9323fb4fb7d4feb4dc.tar.bz2 | |
Values in ZIP files are unsigned.
Bug: 9695860
Change-Id: I5c12dc5f3c70a9fe081adf5bf5b6b4b3a115e7e1
| -rw-r--r-- | luni/src/main/java/java/util/zip/ZipEntry.java | 14 | ||||
| -rw-r--r-- | luni/src/main/java/java/util/zip/ZipFile.java | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/luni/src/main/java/java/util/zip/ZipEntry.java b/luni/src/main/java/java/util/zip/ZipEntry.java index fbd477d..685c1be 100644 --- a/luni/src/main/java/java/util/zip/ZipEntry.java +++ b/luni/src/main/java/java/util/zip/ZipEntry.java @@ -366,24 +366,24 @@ public class ZipEntry implements ZipConstants, Cloneable { } it.seek(8); - int gpbf = it.readShort(); + int gpbf = it.readShort() & 0xffff; if ((gpbf & ZipFile.GPBF_UNSUPPORTED_MASK) != 0) { throw new ZipException("Invalid General Purpose Bit Flag: " + gpbf); } - compressionMethod = it.readShort(); - time = it.readShort(); - modDate = it.readShort(); + compressionMethod = it.readShort() & 0xffff; + time = it.readShort() & 0xffff; + modDate = it.readShort() & 0xffff; // These are 32-bit values in the file, but 64-bit fields in this object. crc = ((long) it.readInt()) & 0xffffffffL; compressedSize = ((long) it.readInt()) & 0xffffffffL; size = ((long) it.readInt()) & 0xffffffffL; - nameLength = it.readShort(); - int extraLength = it.readShort(); - int commentByteCount = it.readShort(); + nameLength = it.readShort() & 0xffff; + int extraLength = it.readShort() & 0xffff; + int commentByteCount = it.readShort() & 0xffff; // This is a 32-bit value in the file, but a 64-bit field in this object. it.seek(42); diff --git a/luni/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java index 5182f88..7decdc5 100644 --- a/luni/src/main/java/java/util/zip/ZipFile.java +++ b/luni/src/main/java/java/util/zip/ZipFile.java @@ -264,7 +264,7 @@ public class ZipFile implements ZipConstants { // http://www.pkware.com/documents/casestudies/APPNOTE.TXT RAFStream rafStream= new RAFStream(raf, entry.mLocalHeaderRelOffset + 6); DataInputStream is = new DataInputStream(rafStream); - int gpbf = Short.reverseBytes(is.readShort()); + int gpbf = Short.reverseBytes(is.readShort()) & 0xffff; if ((gpbf & ZipFile.GPBF_UNSUPPORTED_MASK) != 0) { throw new ZipException("Invalid General Purpose Bit Flag: " + gpbf); } @@ -272,7 +272,7 @@ public class ZipFile implements ZipConstants { // At position 28 we find the length of the extra data. In some cases // this length differs from the one coming in the central header. is.skipBytes(20); - int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()); + int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()) & 0xffff; is.close(); // Skip the name and this "extra" data or whatever it is: |