aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/util
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2005-02-21 20:29:00 +0000
committerMark Wielaard <mark@gcc.gnu.org>2005-02-21 20:29:00 +0000
commitc149185b71aad7763ab39b2f1dd4a3850dba0f35 (patch)
treefa2b39873490c8be57ac3c2968f03ad9016fd74a /libjava/java/util
parent95b49c6f9d7e0ad2e80ba67ce2ca04b6a4c2648b (diff)
downloadgcc-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/java/util')
-rw-r--r--libjava/java/util/jar/JarFile.java9
1 files changed, 8 insertions, 1 deletions
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)
{