diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-12 00:13:59 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-12 00:13:59 +0100 |
| commit | f96064dfa4191cf58a7d96326002fc6e3423a123 (patch) | |
| tree | 115d97eae9ce9f81fa78be6d1d93b6ad6c4cd2de | |
| parent | fb94a6abf82e5822b492f7d6a49c5da8c3317aeb (diff) | |
| download | libcore-f96064dfa4191cf58a7d96326002fc6e3423a123.zip libcore-f96064dfa4191cf58a7d96326002fc6e3423a123.tar.gz libcore-f96064dfa4191cf58a7d96326002fc6e3423a123.tar.bz2 | |
Revert "Values in ZIP files are unsigned."
This reverts commit fb94a6abf82e5822b492f7d6a49c5da8c3317aeb.
| -rw-r--r-- | luni/src/main/java/java/util/zip/ZipEntry.java | 12 | ||||
| -rw-r--r-- | luni/src/main/java/java/util/zip/ZipFile.java | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/luni/src/main/java/java/util/zip/ZipEntry.java b/luni/src/main/java/java/util/zip/ZipEntry.java index 003d265..e2bfc8d 100644 --- a/luni/src/main/java/java/util/zip/ZipEntry.java +++ b/luni/src/main/java/java/util/zip/ZipEntry.java @@ -360,18 +360,18 @@ public class ZipEntry implements ZipConstants, Cloneable { } it.seek(10); - compressionMethod = it.readShort() & 0xffff; - time = it.readShort() & 0xffff; - modDate = it.readShort() & 0xffff; + compressionMethod = it.readShort(); + time = it.readShort(); + modDate = it.readShort(); // 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() & 0xffff; - int extraLength = it.readShort() & 0xffff; - int commentLength = it.readShort() & 0xffff; + nameLength = it.readShort(); + int extraLength = it.readShort(); + int commentLength = it.readShort(); // 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 181e198..816d1b8 100644 --- a/luni/src/main/java/java/util/zip/ZipFile.java +++ b/luni/src/main/java/java/util/zip/ZipFile.java @@ -259,7 +259,7 @@ public class ZipFile implements ZipConstants { // the one coming in the central header. RAFStream rafstrm = new RAFStream(raf, entry.mLocalHeaderRelOffset + 28); DataInputStream is = new DataInputStream(rafstrm); - int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()) & 0xffff; + int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()); is.close(); // Skip the name and this "extra" data or whatever it is: |