diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-06-23 14:57:14 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-06-23 14:57:14 +0000 |
| commit | 34043bd2e9ad8e2c582e5893838d9694e1796998 (patch) | |
| tree | 243ec58ea55fd7d95b4b5bbf42b5236f7cce297d /libjava | |
| parent | d71ef9d4a69e96ea1a859eb7b535221aaf610c4f (diff) | |
| download | gcc-34043bd2e9ad8e2c582e5893838d9694e1796998.zip gcc-34043bd2e9ad8e2c582e5893838d9694e1796998.tar.gz gcc-34043bd2e9ad8e2c582e5893838d9694e1796998.tar.bz2 | |
InflaterInputStream.java (read): Throw ZipException if inflater throws a DataFormatException.
* java/util/zip/InflaterInputStream.java (read): Throw
ZipException if inflater throws a DataFormatException.
From-SVN: r27719
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/zip/InflaterInputStream.java | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1581108..9bd1842 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-06-23 Tom Tromey <tromey@cygnus.com> + + * java/util/zip/InflaterInputStream.java (read): Throw + ZipException if inflater throws a DataFormatException. + 1999-06-23 Warren Levy <warrenl@cygnus.com> * java/net/DatagramSocketImpl.java (localPort): Fixed typo to match JDK. diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index 7ee4455..7471247 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -67,7 +67,14 @@ public class InflaterInputStream extends FilterInputStream fill (); if (inf.needsDictionary()) return -1; - return inf.inflate(buf, off, len); + try + { + return inf.inflate(buf, off, len); + } + catch (DataFormatException dfe) + { + throw new ZipException (dfe.getMessage()); + } } public long skip (long n) throws IOException |