update bundled libzip to 1.1.2

Author: remicollet

NEWS

@@ -81,6 +81,7 @@ PHP                                                                        NEWS
 
 - Zip:
   . Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo). (Laruence)
+  . Update bundled libzip to 1.1.2. (Remi, Anatol)
 
 04 Feb 2016 PHP 7.0.3
 

ext/zip/config.m4

@@ -122,6 +122,7 @@ if test "$PHP_ZIP" != "no"; then
 			lib/zip_get_archive_comment.c lib/zip_get_archive_flag.c lib/zip_get_compression_implementation.c\
 			lib/zip_get_encryption_implementation.c lib/zip_get_file_comment.c lib/zip_get_name.c lib/zip_get_num_entries.c \
 			lib/zip_get_num_files.c lib/zip_memdup.c lib/zip_name_locate.c lib/zip_new.c lib/zip_open.c lib/zip_rename.c lib/zip_replace.c\
+			lib/zip_hash.c \
 			lib/zip_set_archive_comment.c lib/zip_set_archive_flag.c lib/zip_set_default_password.c lib/zip_set_file_comment.c\
 			lib/zip_set_file_compression.c lib/zip_set_name.c lib/zip_source_buffer.c lib/zip_source_close.c lib/zip_source_crc.c\
 			lib/zip_source_deflate.c lib/zip_source_error.c lib/zip_source_file.c lib/zip_source_filep.c lib/zip_source_free.c\

ext/zip/config.w32

@@ -21,6 +21,7 @@ if (PHP_ZIP != "no") {
 			zip_get_archive_comment.c zip_get_archive_flag.c zip_get_compression_implementation.c\
 			zip_get_encryption_implementation.c zip_get_file_comment.c zip_get_name.c zip_get_num_entries.c \
 			zip_get_num_files.c zip_memdup.c zip_name_locate.c zip_new.c zip_open.c zip_rename.c zip_replace.c\
+			zip_hash.c \
 			zip_set_archive_comment.c zip_set_archive_flag.c zip_set_default_password.c zip_set_file_comment.c\
 			zip_set_file_compression.c zip_set_name.c zip_source_buffer.c zip_source_close.c zip_source_crc.c\
 			zip_source_deflate.c zip_source_error.c zip_source_filep.c zip_source_free.c\

ext/zip/lib/zip_add_entry.c

@@ -1,6 +1,6 @@
 /*
   zip_add_entry.c -- create and init struct zip_entry
-  Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <[email protected]>
@@ -46,8 +46,19 @@ _zip_add_entry(zip_t *za)
 
     if (za->nentry+1 >= za->nentry_alloc) {
 	zip_entry_t *rentries;
-	zip_uint64_t nalloc = za->nentry_alloc + 16;
-	zip_uint64_t realloc_size = sizeof(struct zip_entry) * (size_t)nalloc;
+	zip_uint64_t nalloc = za->nentry_alloc;
+	zip_uint64_t additional_entries = 2 * nalloc;
+	zip_uint64_t realloc_size;
+
+	if (additional_entries < 16) {
+	    additional_entries = 16;
+	}
+	else if (additional_entries > 1024) {
+	    additional_entries = 1024;
+	}
+	/* neither + nor * overflows can happen: nentry_alloc * sizeof(struct zip_entry) < UINT64_MAX */
+	nalloc += additional_entries;
+	realloc_size = sizeof(struct zip_entry) * (size_t)nalloc;
 
 	if (sizeof(struct zip_entry) * (size_t)za->nentry_alloc > realloc_size) {
 	    zip_error_set(&za->error, ZIP_ER_MEMORY, 0);

ext/zip/lib/zip_buffer.c

@@ -303,6 +303,17 @@ _zip_buffer_set_offset(zip_buffer_t *buffer, zip_uint64_t offset)
 }
 
 
+int
+_zip_buffer_skip(zip_buffer_t *buffer, zip_uint64_t length) {
+    zip_uint64_t offset = buffer->offset + length;
+    
+    if (offset < buffer->offset) {
+        buffer->ok = false;
+        return -1;
+    }
+    return _zip_buffer_set_offset(buffer, offset);
+}
+
 zip_uint64_t
 _zip_buffer_size(zip_buffer_t *buffer)
 {

ext/zip/lib/zip_close.c

@@ -40,7 +40,6 @@
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

ext/zip/lib/zip_delete.c

@@ -1,6 +1,6 @@
 /*
   zip_delete.c -- delete file from zip archive
-  Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <[email protected]>
@@ -38,6 +38,8 @@
 ZIP_EXTERN int
 zip_delete(zip_t *za, zip_uint64_t idx)
 {
+    const char *name;
+
     if (idx >= za->nentry) {
 	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
@@ -48,6 +50,14 @@ zip_delete(zip_t *za, zip_uint64_t idx)
 	return -1;
     }
 
+    if ((name=_zip_get_name(za, idx, 0, &za->error)) == NULL) {
+	return -1;
+    }
+
+    if (!_zip_hash_delete(za->names, (const zip_uint8_t *)name, &za->error)) {
+	return -1;
+    }
+
     /* allow duplicate file names, because the file will
      * be removed directly afterwards */
     if (_zip_unchange(za, idx, 1) != 0)