diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-07 12:29:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-07 12:29:50 +0000 |
| commit | e25881196b4cb5f056619bf2883b10bb861dd704 (patch) | |
| tree | 8ae52daeb1bd532b69cf70cb2085e6c0b8719f3e /luni/src/main/java | |
| parent | 2dbbb9e769a075ad07b7ee811be645b2e06ad40d (diff) | |
| parent | b6d280493ffca2b63c7b850360309521af2b962e (diff) | |
| download | libcore-e25881196b4cb5f056619bf2883b10bb861dd704.zip libcore-e25881196b4cb5f056619bf2883b10bb861dd704.tar.gz libcore-e25881196b4cb5f056619bf2883b10bb861dd704.tar.bz2 | |
Merge "GZIPInputStream: Correctly handle extras in gzip headers."
Diffstat (limited to 'luni/src/main/java')
| -rw-r--r-- | luni/src/main/java/java/util/zip/GZIPInputStream.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/java/java/util/zip/GZIPInputStream.java b/luni/src/main/java/java/util/zip/GZIPInputStream.java index afbbafe..925e8c4 100644 --- a/luni/src/main/java/java/util/zip/GZIPInputStream.java +++ b/luni/src/main/java/java/util/zip/GZIPInputStream.java @@ -222,7 +222,7 @@ public class GZIPInputStream extends InflaterInputStream { if (hcrc) { crc.update(header, 0, 2); } - int length = Memory.peekShort(scratch, 0, ByteOrder.LITTLE_ENDIAN) & 0xffff; + int length = Memory.peekShort(header, 0, ByteOrder.LITTLE_ENDIAN) & 0xffff; while (length > 0) { int max = length > scratch.length ? scratch.length : length; int result = in.read(scratch, 0, max); |