Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741
2012-03-23 15:19:26 +00:00
parent 21669dfe20
commit 0563022a20
516 changed files with 64503 additions and 61116 deletions
@@ -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();