diff options
| author | Mark Wielaard <mark@klomp.org> | 2005-02-21 20:29:00 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2005-02-21 20:29:00 +0000 |
| commit | c149185b71aad7763ab39b2f1dd4a3850dba0f35 (patch) | |
| tree | fa2b39873490c8be57ac3c2968f03ad9016fd74a /libjava | |
| parent | 95b49c6f9d7e0ad2e80ba67ce2ca04b6a4c2648b (diff) | |
| download | gcc-c149185b71aad7763ab39b2f1dd4a3850dba0f35.zip gcc-c149185b71aad7763ab39b2f1dd4a3850dba0f35.tar.gz gcc-c149185b71aad7763ab39b2f1dd4a3850dba0f35.tar.bz2 | |
JarFile.java (verifyHashes): Check whether ZipEntry exists.
* java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry
exists.
From-SVN: r95347
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/jar/JarFile.java | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7d869d5..1c141df 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-02-21 Mark Wielaard <mark@klomp.org> + + * java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry + exists. + 2005-02-21 Andrew Haley <aph@redhat.com> * Makefile.in: Rebuilt. diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java index c66881f..cb2cbf4 100644 --- a/libjava/java/util/jar/JarFile.java +++ b/libjava/java/util/jar/JarFile.java @@ -726,7 +726,14 @@ public class JarFile extends ZipFile byte[] entryBytes = null; try { - entryBytes = readManifestEntry(super.getEntry(entry)); + ZipEntry e = super.getEntry(entry); + if (e == null) + { + if (DEBUG) + debug("verifyHashes: no entry '" + entry + "'"); + return false; + } + entryBytes = readManifestEntry(e); } catch (IOException ioe) { |