diff options
| author | Anatol Belski <ab@php.net> | 2018-07-10 11:19:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-07-10 11:19:54 +0200 |
| commit | ebb590b625efb443e43bad8b0cfd915bc20c380e (patch) | |
| tree | 9b39b92c82fd2c57f4ffb1bfd0cd132d5a8a9d77 /ext | |
| parent | 474292c3e4ed3f1c613dad51c13f61fe23eb6501 (diff) | |
| parent | 08f08858f3bc62fac9150ca5b669df060b5af5a5 (diff) | |
| download | php-git-ebb590b625efb443e43bad8b0cfd915bc20c380e.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #76524 - ZipArchive memory leak
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/zip/php_zip.c | 7 | ||||
| -rw-r--r-- | ext/zip/tests/bug76524.phpt | 21 |
2 files changed, 26 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 6444853b8b..d83272f564 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1026,10 +1026,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) { diff --git a/ext/zip/tests/bug76524.phpt b/ext/zip/tests/bug76524.phpt new file mode 100644 index 0000000000..f28bfc13f2 --- /dev/null +++ b/ext/zip/tests/bug76524.phpt @@ -0,0 +1,21 @@ +--TEST-- +ZipArchive Bug #76524 (memory leak with ZipArchive::OVERWRITE flag and empty archive) +--SKIPIF-- +<?php +if(!extension_loaded('zip')) die('skip'); +?> +--FILE-- +<?php + +$filename = __DIR__ . '/nonexistent.zip'; + +$zip = new ZipArchive(); +$zip->open($filename, ZipArchive::CREATE | ZipArchive::OVERWRITE); +echo 'ok'; + +/* Zip-related error messages depend on platform and libzip version, + so the regex is used to check that Zend MM does NOT show warnings + about leaks: */ +?> +--EXPECTREGEX-- +ok((?!memory leaks detected).)* |