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_delete.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_delete.c')
| -rw-r--r-- | ext/zip/lib/zip_delete.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ext/zip/lib/zip_delete.c b/ext/zip/lib/zip_delete.c index b3e7abb848..34520b0310 100644 --- a/ext/zip/lib/zip_delete.c +++ b/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 <libzip@nih.at> @@ -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) |