Do not overwrite file size if the local file header has valid file size.

This allows us to extract index.xml from Apple iWork '09 format files.

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index 450a6f7da51908d6894a0b3b909df087051b40c8..c9fae7f24b84d68ad197e0645e131096aac0d4d3 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1619,10 +1619,12 @@ process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
                switch (headerid) {
                case 0x0001:
                        /* Zip64 extended information extra field. */
-                       if (datasize >= 8)
+                       if (datasize >= 8 &&
+                           zip_entry->uncompressed_size == 0xffffffff)
                                zip_entry->uncompressed_size =
                                    archive_le64dec(p + offset);
-                       if (datasize >= 16)
+                       if (datasize >= 16 &&
+                           zip_entry->compressed_size == 0xffffffff)
                                zip_entry->compressed_size =
                                    archive_le64dec(p + offset + 8);
                        break;