--- old/src/share/classes/java/util/zip/ZipInputStream.java	2014-06-04 12:08:06.000000000 -0700
+++ new/src/share/classes/java/util/zip/ZipInputStream.java	2014-06-04 12:08:06.000000000 -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;
     }