summaryrefslogtreecommitdiffstats
path: root/libjava/java
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-21 20:29:00 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-21 20:29:00 +0000
commit8161f7fbd980f4d3b2d8d15e82a838782ade1686 (patch)
treefa2b39873490c8be57ac3c2968f03ad9016fd74a /libjava/java
parent5b7bf9b959297dbd4e335edd8e9446cc46c762cd (diff)
downloadppe42-gcc-8161f7fbd980f4d3b2d8d15e82a838782ade1686.tar.gz
ppe42-gcc-8161f7fbd980f4d3b2d8d15e82a838782ade1686.zip
* 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
Diffstat (limited to 'libjava/java')
-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 c66881f1900..cb2cbf4900c 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)
{
OpenPOWER on IntegriCloud