* java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry

       exists.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95347 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7d869d5a2b21aafa5ed22cecf0fdd7734c386c87..1c141df39057b2326091432dab1ae8e0a0425d9c 100644 (file)
--- 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 c66881f1900c2d2d8868215d92e49f051b1bc620..cb2cbf4900c13ab173fe92690f2635c0321273f7 100644 (file)
--- 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)
       {