diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-04-03 19:56:15 +0100 |
| commit | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (patch) | |
| tree | 3612c90af5d656357045e107ccac556863e929a3 /ext/zip/lib/zip_delete.c | |
| parent | df85331220ac60391d5f8d82c42a6c699f47fca1 (diff) | |
| parent | 80015ba741fc857074050086db6c7b2a4716d6d5 (diff) | |
| download | php-git-6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a.tar.gz | |
Merge branch 'openssl_error_store' of github.com:bukka/php-src into openssl_error_store
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) |