commit 94cc0985ea07a2d69ef07ac9d3a9943e094794f2
author Xùdōng Yáng <wyverald@gmail.com> Fri Apr 08 17:02:22 2022 +0200
committer GitHub <noreply@github.com> Fri Apr 08 17:02:22 2022 +0200
tree a872579b98bc84b7b261ea8f92f1cf927b24855d
parent 8ae15207ecf0be3f45b8cd249077a2c1896e2b09

Support ZIP files with total number of disks = 0 (#15200)

We came across [a problem](https://buildkite.com/bazel/intellij-plugin/builds/15968#0863eaa6-499b-46a2-a146-79d4c2b830c0) adding a jar provided by IntelliJ in its 2022.1 (lib/app.jar) to a `java_import` target because the jar in this version has a total number of disks = 0.

This value is supported by other tools: https://github.com/python/cpython/blob/main/Lib/zipfile.py#L258

PiperOrigin-RevId: 440322029

Co-authored-by: messa <messa@google.com>

third_party/ijar/zip.cc

diff --git a/third_party/ijar/zip.cc b/third_party/ijar/zip.cc
index ef8479e..45b7fc7 100644
--- a/third_party/ijar/zip.cc
+++ b/third_party/ijar/zip.cc
@@ -707,7 +707,8 @@
   if (MaybeReadZip64CentralDirectory(bytes, in_length,
                                      bytes + zip64_end_of_central_dir_offset,
                                      end_of_central_dir, cd)) {
-    if (disk_with_zip64_central_directory != 0 || zip64_total_disks != 1) {
+    // TODO(b/228519294) Add a test for a valid zip64 file with total disks = 0
+    if (disk_with_zip64_central_directory != 0 || zip64_total_disks > 1) {
       fprintf(stderr, "multi-disk JAR files are not supported\n");
       return false;
     }