diff options
| -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) { |