Allow zip64 for directories in central directory header. #543

zlib-ng · Dec 24, 2020 · 05debde · 05debde
1 parent b2a148c
commit 05debde
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/mz_zip.c b/mz_zip.c
@@ -557,15 +557,19 @@ static int32_t mz_zip_entry_needs_zip64(mz_zip_file *file_info, uint8_t local, u
     if (zip64 == NULL)
         return MZ_PARAM_ERROR;
 
-    if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) {
-        *zip64 = 0;
-        return MZ_OK;
-    }
+    if (local) {
+        /* Local header directory entries does not need zip64 because sizes are zero */
+
+        if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK) {
+            *zip64 = 0;
+            return MZ_OK;
+        }
+
+        /* At local header we might not know yet whether compressed size will overflow unsigned
+           32-bit integer which might happen for high entropy data so we give it some cushion */
 
-    /* At local header we might not know yet whether compressed size will overflow unsigned
-       32-bit integer which might happen for high entropy data so we give it some cushion */
-    if (local)
         max_uncompressed_size -= MZ_ZIP_UNCOMPR_SIZE64_CUSHION;
+    }
 
     needs_zip64 = (file_info->uncompressed_size >= max_uncompressed_size) ||
                   (file_info->compressed_size >= UINT32_MAX) ||