diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-22 20:16:17 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-22 20:16:17 +0000 |
| commit | 3f8eac3cd918da270d591262973877392c3dfeca (patch) | |
| tree | 2387909c6af042a5d6b9fd456ab20930ba600a61 /libjava/java/util/zip/GZIPInputStream.java | |
| parent | f212e042935f3d9edfa581cae3f63447a48efcb0 (diff) | |
| download | ppe42-gcc-3f8eac3cd918da270d591262973877392c3dfeca.tar.gz ppe42-gcc-3f8eac3cd918da270d591262973877392c3dfeca.zip | |
PR libgcj/14446:
* java/util/zip/GZIPInputStream.java (read): Avoid sign extension
when comparing CRCs.
* java/util/zip/InflaterInputStream.java (onebytebuffer): New
field.
(read()): New overload.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87882 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/zip/GZIPInputStream.java')
| -rw-r--r-- | libjava/java/util/zip/GZIPInputStream.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/java/util/zip/GZIPInputStream.java b/libjava/java/util/zip/GZIPInputStream.java index 9eef73eb945..56401639e0c 100644 --- a/libjava/java/util/zip/GZIPInputStream.java +++ b/libjava/java/util/zip/GZIPInputStream.java @@ -230,7 +230,9 @@ public class GZIPInputStream tmp[i] = (byte) eof_read(); } - int header_crc = read4(tmp, 0); + // Be careful to avoid sign extension here; CRC32.getValue() + // returns a long. + long header_crc = read4(tmp, 0) & 0xffffffffL; if (crc.getValue() != header_crc) throw new ZipException("corrupted gzip file - crc mismatch"); int isize = read4(tmp, 4); |
