diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-02-09 23:35:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-02-09 23:35:55 +0800 |
| commit | 33417bf409f22b4f15d46d09a63bfdd7c4351999 (patch) | |
| tree | 28e71f38181c364d9a345d1eaa8a360eb59651dc /ext/zip | |
| parent | a219fc175333f11c0e2fe90efd25e7d8fee5fdfb (diff) | |
| parent | c339d5217aa1966689424c911c8f455652861bf7 (diff) | |
| download | php-git-33417bf409f22b4f15d46d09a63bfdd7c4351999.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/zip/php_zip.c
Diffstat (limited to 'ext/zip')
| -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; } } |