diff options
| author | Remi Collet <remi@php.net> | 2016-02-22 18:18:43 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2016-02-22 18:18:43 +0100 |
| commit | 29cc01082993cabd12f95088f0970c657e03b852 (patch) | |
| tree | ba06cb91fcbe44c7e3de88a7d6d77c61212d22a3 /ext/zip/lib/zip_source_win32handle.c | |
| parent | d5769d4234a2cbb8d15140083de018a67195a583 (diff) | |
| parent | 0d57c06b2c02678eeb724ea512b8ce4c85a339b2 (diff) | |
| download | php-git-29cc01082993cabd12f95088f0970c657e03b852.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
update bundled libzip to 1.1.2
Diffstat (limited to 'ext/zip/lib/zip_source_win32handle.c')
| -rw-r--r-- | ext/zip/lib/zip_source_win32handle.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/zip/lib/zip_source_win32handle.c b/ext/zip/lib/zip_source_win32handle.c index d195a119db..35e2e67972 100644 --- a/ext/zip/lib/zip_source_win32handle.c +++ b/ext/zip/lib/zip_source_win32handle.c @@ -1,6 +1,6 @@ /* zip_source_win32file.c -- create data source from HANDLE (Win32) -Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner +Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -33,7 +33,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <wchar.h> -#include <errno.h> #include <stdlib.h> #include <string.h> @@ -409,6 +408,7 @@ _win32_read_file(void *state, void *data, zip_uint64_t len, zip_source_cmd_t cmd static int _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) { + zip_uint32_t value; /* Windows has GetTempFileName(), but it closes the file after creation, leaving it open to a horrible race condition. So @@ -423,7 +423,6 @@ _win32_create_temp_file(_zip_source_win32_read_file_t *ctx) PSECURITY_ATTRIBUTES psa = NULL; DWORD len; BOOL success; - zip_uint32_t value; /* Read the DACL from the original file, so we can copy it to the temp file. |