summaryrefslogtreecommitdiffstats
path: root/libjava/java/util/zip/ZipFile.java
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-05-20 23:30:46 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-05-20 23:30:46 +0000
commit36143eef6be2ce9255998b5914b38194df6d169d (patch)
tree88a48b421e4bd8ac7064e837896ccf0ff941907b /libjava/java/util/zip/ZipFile.java
parent21724bde63544ace635db468cf2a9dd3ca1ec106 (diff)
downloadppe42-gcc-36143eef6be2ce9255998b5914b38194df6d169d.tar.gz
ppe42-gcc-36143eef6be2ce9255998b5914b38194df6d169d.zip
2000-05-20 Bryce McKinlay <bryce@albatross.co.nz>
Fix for PR libgcj/226: * java/lang/Class.h (_Jv_InitClass): Don't call __builtin_expect, since this is an installed header. Fix for PR libgcj/228: * java/util/zip/ZipFile (getInputStream): Create inflater with nowrapper option. * java/util/zip/natInflater.cc (inflate): Throw zlib's error message with DataFormatException. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34064 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/zip/ZipFile.java')
-rw-r--r--libjava/java/util/zip/ZipFile.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java
index 5e01d57923b..78257869fe9 100644
--- a/libjava/java/util/zip/ZipFile.java
+++ b/libjava/java/util/zip/ZipFile.java
@@ -133,7 +133,9 @@ public class ZipFile implements ZipConstants
InputStream is = new ByteArrayInputStream (buffer);
if (ze.getMethod() == ZipEntry.DEFLATED)
- is = new InflaterInputStream (is);
+ // Data in zipfile entries does not have a zlib header, so construct
+ // an Inflater with the `nowrapper' option.
+ is = new InflaterInputStream (is, new Inflater (true), 512);
return is;
}
OpenPOWER on IntegriCloud