From 0563022a206294757effa44686727bffc4f7c2bd Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gandalf@gcc.gnu.org>
Date: Fri, 23 Mar 2012 15:19:26 +0000
Subject: Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741
---
 libjava/classpath/java/util/zip/ZipFile.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libjava/classpath/java/util/zip/ZipFile.java')

diff --git a/libjava/classpath/java/util/zip/ZipFile.java b/libjava/classpath/java/util/zip/ZipFile.java
index 3963bcb..b582c84 100644
--- a/libjava/classpath/java/util/zip/ZipFile.java
+++ b/libjava/classpath/java/util/zip/ZipFile.java
@@ -261,7 +261,10 @@ public class ZipFile implements ZipConstants
         if (inp.readLeInt() != CENSIG)
           throw new ZipException("Wrong Central Directory signature: " + name);
 
-        inp.skip(6);
+        inp.skip(4);
+        int flags = inp.readLeShort();
+        if ((flags & 1) != 0)
+          throw new ZipException("invalid CEN header (encrypted entry)");
         int method = inp.readLeShort();
         int dostime = inp.readLeInt();
         int crc = inp.readLeInt();
-- 
cgit v1.1