Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8044727: Problem reading the contents of some zip files
authorsherman
Wed, 04 Jun 2014 14:00:19 -0700
changeset 24711 796059d86950
parent 24710 c019dc4104b2
child 24712 a15661b75c64
8044727: Problem reading the contents of some zip files Summary: zis.readLOC() should not interpret ZIP64 data in extra field, if not necessary Reviewed-by: alanb
jdk/src/share/classes/java/util/zip/ZipInputStream.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java	Wed Jun 04 11:25:13 2014 -0700
+++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java	Wed Jun 04 14:00:19 2014 -0700
@@ -319,7 +319,8 @@
         if (len > 0) {
             byte[] extra = new byte[len];
             readFully(extra, 0, len);
-            e.setExtra0(extra, true);
+            e.setExtra0(extra,
+                        e.csize == ZIP64_MAGICVAL || e.size == ZIP64_MAGICVAL);
         }
         return e;
     }
jdk-sandbox