From: Mark Wielaard <mark@klomp.org>
Date: Mon, 21 Feb 2005 20:29:00 +0000 (+0000)
Subject: JarFile.java (verifyHashes): Check whether ZipEntry exists.
X-Git-Tag: releases/gcc-4.0.0~690
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c149185b71aad7763ab39b2f1dd4a3850dba0f35;p=thirdparty%2Fgcc.git

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

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

From-SVN: r95347
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7d869d5a2b21..1c141df39057 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 c66881f1900c..cb2cbf4900c1 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)
       {