src/java.base/share/classes/java/util/zip/ZipEntry.java

*** 1,7 ****
  /*
!  * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 520,541 ****
       *         extra field data is greater than 0xFFFF bytes
       *
       * @see #getExtra()
       */
      public void setExtra(byte[] extra) {
!         setExtra0(extra, false);
      }
  
      /**
       * Sets the optional extra field data for the entry.
       *
       * @param extra
       *        the extra field data bytes
       * @param doZIP64
       *        if true, set size and csize from ZIP64 fields if present
       */
!     void setExtra0(byte[] extra, boolean doZIP64) {
          if (extra != null) {
              if (extra.length > 0xFFFF) {
                  throw new IllegalArgumentException("invalid extra field length");
              }
              // extra fields are in "HeaderID(2)DataSize(2)Data... format
--- 520,544 ----
       *         extra field data is greater than 0xFFFF bytes
       *
       * @see #getExtra()
       */
      public void setExtra(byte[] extra) {
!         setExtra0(extra, false, true);
      }
  
      /**
       * Sets the optional extra field data for the entry.
       *
       * @param extra
       *        the extra field data bytes
       * @param doZIP64
       *        if true, set size and csize from ZIP64 fields if present
+      * @param isLOC
+      *        true if setting the extra field for a LOC, false if for
+      *        a CEN
       */
!     void setExtra0(byte[] extra, boolean doZIP64, boolean isLOC) {
          if (extra != null) {
              if (extra.length > 0xFFFF) {
                  throw new IllegalArgumentException("invalid extra field length");
              }
              // extra fields are in "HeaderID(2)DataSize(2)Data... format
*** 548,567 ****
--- 551,584 ----
                  if (off + sz > len)         // invalid data
                      break;
                  switch (tag) {
                  case EXTID_ZIP64:
                      if (doZIP64) {
+                         if (isLOC) {
                              // LOC extra zip64 entry MUST include BOTH original
                              // and compressed file size fields.
                              // If invalid zip64 extra fields, simply skip. Even
                              // it's rare, it's possible the entry size happens to
                              // be the magic value and it "accidently" has some
                              // bytes in extra match the id.
                              if (sz >= 16) {
                                  size = get64(extra, off);
                                  csize = get64(extra, off + 8);
                              }
+                         } else {
+                             // CEN extra zip64
+                             if (size == ZIP64_MAGICVAL) {
+                                 if (off + 8 > len)  // invalid zip64 extra
+                                     break;          // fields, just skip
+                                 size = get64(extra, off);
+                             }
+                             if (csize == ZIP64_MAGICVAL) {
+                                 if (off + 16 > len)  // invalid zip64 extra
+                                     break;           // fields, just skip
+                                 csize = get64(extra, off + 8);
+                             }
+                         }
                      }
                      break;
                  case EXTID_NTFS:
                      if (sz < 32) // reserved  4 bytes + tag 2 bytes + size 2 bytes
                          break;   // m[a|c]time 24 bytes