diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-02-10 12:58:19 +0000 |
| commit | daf3d0c875634547748b791fb6291e78103bf6dc (patch) | |
| tree | 667c296cf01f1d81a0b0199eb2245c6abb1fed19 /ext/zip/php_zip.c | |
| parent | 3ac63df9bc27226c25cca5c87804896d33a7ab4f (diff) | |
| parent | aeb5319336aa447ad24968479b8aa249dd4c43a7 (diff) | |
| download | php-git-daf3d0c875634547748b791fb6291e78103bf6dc.tar.gz | |
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index c31ace1f8d..ff3e60e4a9 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -2668,7 +2668,7 @@ static ZIPARCHIVE_METHOD(extractTo) for (i = 0; i < filecount; i++) { char *file = (char*)zip_get_name(intern, i, ZIP_FL_UNCHANGED); - if (!php_zip_extract_file(intern, pathto, file, strlen(file))) { + if (!file || !php_zip_extract_file(intern, pathto, file, strlen(file))) { RETURN_FALSE; } } |