From 08f08858f3bc62fac9150ca5b669df060b5af5a5 Mon Sep 17 00:00:00 2001 From: timurib Date: Mon, 25 Jun 2018 14:14:26 +0300 Subject: Fix bug #76524 - ZipArchive memory leak Bugfix #76524: Free up zip internal state and adjust the tests for Windows Bugfix #76524: Fix possible use after free for libzip 1.3.1 Bugfix #76524: Make the test independent of platform --- ext/zip/php_zip.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ext/zip/php_zip.c') diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index ade0b99173..cdf77f20cd 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1003,10 +1003,13 @@ static void php_zip_object_free_storage(zend_object *object) /* {{{ */ } if (intern->za) { if (zip_close(intern->za) != 0) { +#if LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR == 3 && LIBZIP_VERSION_MICRO == 1 + php_error_docref(NULL, E_WARNING, "Cannot destroy the zip context: %s", "zip_close have failed"); +#else php_error_docref(NULL, E_WARNING, "Cannot destroy the zip context: %s", zip_strerror(intern->za)); - return; + zip_discard(intern->za); +#endif } - intern->za = NULL; } if (intern->buffers_cnt>0) { -- cgit v1.2.1