Merge branch 'PHP-7.2'

* PHP-7.2: NEWS NEWS NEWS fix bug #75540 Segfault with libzip 1.3.1
UziTech · Nov 20, 2017 · 15a0de4 · 15a0de4
2 parents 23b61f7 + 045e0fc
commit 15a0de4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -1549,7 +1549,10 @@ static ZIPARCHIVE_METHOD(close)
 
 	if ((err = zip_close(intern))) {
 		php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern));
+#if LIBZIP_VERSION_MAJOR < 1 || (LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR < 3) || (LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR == 3 && LIBZIP_VERSION_MICRO < 1)
+		/* Fix memory leak in libzip < 1.3.1 */
 		zip_discard(intern);
+#endif
 	}
 
 	efree(ze_obj->filename);