summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/zip/php_zip.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0fc0565798..a13c4b2d54 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ PHP NEWS
- Standard:
. Fixed bug #70720 (strip_tags improper php code parsing). (Julien)
+- Zip:
+ . Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo). (Laruence)
+
04 Feb 2016, PHP 5.6.18
- Core:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index d040d206d1..ccd0467fd3 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -2713,7 +2713,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) TSRMLS_CC)) {
+ if (!file || !php_zip_extract_file(intern, pathto, file, strlen(file) TSRMLS_CC)) {
RETURN_FALSE;
}
}