From c149185b71aad7763ab39b2f1dd4a3850dba0f35 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 21 Feb 2005 20:29:00 +0000 Subject: [PATCH] JarFile.java (verifyHashes): Check whether ZipEntry exists. * java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry exists. From-SVN: r95347 --- libjava/ChangeLog | 5 +++++ libjava/java/util/jar/JarFile.java | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7d869d5a2b2..1c141df3905 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-02-21 Mark Wielaard + + * java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry + exists. + 2005-02-21 Andrew Haley * Makefile.in: Rebuilt. 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) { -- 2.30.2