From de47d4792fdefbcea023877c931cbdc15dd38963 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Nov 2017 08:49:46 +0100 Subject: fix bug #75540 Segfault with libzip 1.3.1 --- ext/zip/php_zip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 45bf8afb67..f439340ed8 100644 --- 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); -- cgit v1.2.1