Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: NEWS fix bug #75540 Segfault with libzip 1.3.1
9 years ago · 0c54397879
1 changed files with 3 additions and 0 deletions
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@ -1514,7 +1514,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);