JarFile.java (verifyHashes): Check whether ZipEntry exists.

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

From-SVN: r95347

libjava/ChangeLog

+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.

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