archive-zip: support more than 65535 entries
Support more than 65535 entries cleanly by writing a "zip64 end of central directory record" (with a 64-bit field for the number of entries) before the usual "end of central directory record" (which contains only a 16-bit field). InfoZIP's zip does the same. Archives with 65535 or less entries are not affected. Programs that extract all files like InfoZIP's zip and 7-Zip ignored the field and could extract all files already. Software that relies on the ZIP file directory to show a list of contained files quickly to simulate to normal directory like Windows' built-in ZIP functionality only saw a subset of the included files. Windows supports ZIP64 since Vista according to https://en.wikipedia.org/wiki/Zip_%28file_format%29#ZIP64. Suggested-by: Johannes Schauer <josch@debian.org> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 22, 2015 at 21:06 UTC
88329ca8091b16f4bb01e3ea546c8c5e1a5016ec
2 files changed
+91
-4
archive-zip.c
+90
-3
@@ -16,7 +16,9 @@ static unsigned int zip_dir_size;
16
17
static unsigned int zip_offset;
18
static unsigned int zip_dir_offset;
19
-static unsigned int zip_dir_entries;
19
+static uint64_t zip_dir_entries;
20
+
21
+static unsigned int max_creator_version;
22
23
#define ZIP_DIRECTORY_MIN_SIZE (1024 * 1024)
24
#define ZIP_STREAM (1 << 3)
@@ -86,6 +88,28 @@ struct zip_extra_mtime {
88
unsigned char _end[1];
89
};
90
91
+struct zip64_dir_trailer {
92
+ unsigned char magic[4];
93
+ unsigned char record_size[8];
94
+ unsigned char creator_version[2];
95
+ unsigned char version[2];
96
+ unsigned char disk[4];
97
+ unsigned char directory_start_disk[4];
98
+ unsigned char entries_on_this_disk[8];
99
+ unsigned char entries[8];
100
+ unsigned char size[8];
101
+ unsigned char offset[8];
102
+ unsigned char _end[1];
103
+};
104
+
105
+struct zip64_dir_trailer_locator {
106
+ unsigned char magic[4];
107
+ unsigned char disk[4];
108
+ unsigned char offset[8];
109
+ unsigned char number_of_disks[4];
110
+ unsigned char _end[1];
111
+};
112
+
113
/*
114
* On ARM, padding is added at the end of the struct, so a simple
115
* sizeof(struct ...) reports two bytes more than the payload size
@@ -98,6 +122,12 @@ struct zip_extra_mtime {
122
#define ZIP_EXTRA_MTIME_SIZE offsetof(struct zip_extra_mtime, _end)
123
#define ZIP_EXTRA_MTIME_PAYLOAD_SIZE \
124
(ZIP_EXTRA_MTIME_SIZE - offsetof(struct zip_extra_mtime, flags))
125
+#define ZIP64_DIR_TRAILER_SIZE offsetof(struct zip64_dir_trailer, _end)
126
+#define ZIP64_DIR_TRAILER_RECORD_SIZE \
127
+ (ZIP64_DIR_TRAILER_SIZE - \
128
+ offsetof(struct zip64_dir_trailer, creator_version))
129
+#define ZIP64_DIR_TRAILER_LOCATOR_SIZE \
130
+ offsetof(struct zip64_dir_trailer_locator, _end)
131
132
static void copy_le16(unsigned char *dest, unsigned int n)
133
{
@@ -113,6 +143,31 @@ static void copy_le32(unsigned char *dest, unsigned int n)
143
dest[3] = 0xff & (n >> 030);
144
}
145
146
+static void copy_le64(unsigned char *dest, uint64_t n)
147
+{
148
+ dest[0] = 0xff & n;
149
+ dest[1] = 0xff & (n >> 010);
150
+ dest[2] = 0xff & (n >> 020);
151
+ dest[3] = 0xff & (n >> 030);
152
+ dest[4] = 0xff & (n >> 040);
153
+ dest[5] = 0xff & (n >> 050);
154
+ dest[6] = 0xff & (n >> 060);
155
+ dest[7] = 0xff & (n >> 070);
156
+}
157
+
158
+static uint64_t clamp_max(uint64_t n, uint64_t max, int *clamped)
159
+{
160
+ if (n <= max)
161
+ return n;
162
+ *clamped = 1;
163
+ return max;
164
+}
165
+
166
+static void copy_le16_clamp(unsigned char *dest, uint64_t n, int *clamped)
167
+{
168
+ copy_le16(dest, clamp_max(n, 0xffff, clamped));
169
+}
170
+
171
static void *zlib_deflate_raw(void *data, unsigned long size,
172
int compression_level,
173
unsigned long *compressed_size)
@@ -282,6 +337,9 @@ static int write_zip_entry(struct archiver_args *args,
337
sha1_to_hex(sha1));
338
}
339
340
+ if (creator_version > max_creator_version)
341
+ max_creator_version = creator_version;
342
+
343
if (buffer && method == 8) {
344
out = deflated = zlib_deflate_raw(buffer, size,
345
args->compression_level,
@@ -439,20 +497,49 @@ static int write_zip_entry(struct archiver_args *args,
497
return 0;
498
}
499
500
+static void write_zip64_trailer(void)
501
+{
502
+ struct zip64_dir_trailer trailer64;
503
+ struct zip64_dir_trailer_locator locator64;
504
+
505
+ copy_le32(trailer64.magic, 0x06064b50);
506
+ copy_le64(trailer64.record_size, ZIP64_DIR_TRAILER_RECORD_SIZE);
507
+ copy_le16(trailer64.creator_version, max_creator_version);
508
+ copy_le16(trailer64.version, 45);
509
+ copy_le32(trailer64.disk, 0);
510
+ copy_le32(trailer64.directory_start_disk, 0);
511
+ copy_le64(trailer64.entries_on_this_disk, zip_dir_entries);
512
+ copy_le64(trailer64.entries, zip_dir_entries);
513
+ copy_le64(trailer64.size, zip_dir_offset);
514
+ copy_le64(trailer64.offset, zip_offset);
515
+
516
+ copy_le32(locator64.magic, 0x07064b50);
517
+ copy_le32(locator64.disk, 0);
518
+ copy_le64(locator64.offset, zip_offset + zip_dir_offset);
519
+ copy_le32(locator64.number_of_disks, 1);
520
+
521
+ write_or_die(1, &trailer64, ZIP64_DIR_TRAILER_SIZE);
522
+ write_or_die(1, &locator64, ZIP64_DIR_TRAILER_LOCATOR_SIZE);
523
+}
524
+
525
static void write_zip_trailer(const unsigned char *sha1)
526
{
527
struct zip_dir_trailer trailer;
528
+ int clamped = 0;
529
530
copy_le32(trailer.magic, 0x06054b50);
531
copy_le16(trailer.disk, 0);
532
copy_le16(trailer.directory_start_disk, 0);
449
- copy_le16(trailer.entries_on_this_disk, zip_dir_entries);
450
- copy_le16(trailer.entries, zip_dir_entries);
533
+ copy_le16_clamp(trailer.entries_on_this_disk, zip_dir_entries,
534
+ &clamped);
535
+ copy_le16_clamp(trailer.entries, zip_dir_entries, &clamped);
536
copy_le32(trailer.size, zip_dir_offset);
537
copy_le32(trailer.offset, zip_offset);
538
copy_le16(trailer.comment_length, sha1 ? 40 : 0);
539
540
write_or_die(1, zip_dir, zip_dir_offset);
541
+ if (clamped)
542
+ write_zip64_trailer();
543
write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE);
544
if (sha1)
545
write_or_die(1, sha1_to_hex(sha1), 40);
t/t5004-archive-corner-cases.sh
+1
-1
@@ -122,7 +122,7 @@ test_lazy_prereq ZIPINFO '
122
test "x$n" = "x0"
123
'
124
125
-test_expect_failure ZIPINFO 'zip archive with many entries' '
125
+test_expect_success ZIPINFO 'zip archive with many entries' '
126
# add a directory with 256 files
127
mkdir 00 &&
128
for a in 0 1 2 3 4 5 6 7 8 9 a b c d e f