diff options
| author | Remi Collet <remi@php.net> | 2017-11-20 08:49:46 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-11-20 08:49:46 +0100 |
| commit | de47d4792fdefbcea023877c931cbdc15dd38963 (patch) | |
| tree | 8038f26fb2a5d75f066f9cab28e725db50798d36 | |
| parent | 0e097f2c96ce31b16fa371981045f224e5a37160 (diff) | |
| download | php-git-de47d4792fdefbcea023877c931cbdc15dd38963.tar.gz | |
fix bug #75540 Segfault with libzip 1.3.1
| -rw-r--r-- | ext/zip/php_zip.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |