diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 00:01:42 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 00:01:42 -0700 |
| commit | ed84af4b882a4daf1a93386327853aab326ae67b (patch) | |
| tree | 6fa8c79724e7d91c7918d266ceaf01b8f8663847 | |
| parent | 09de64a58dd1dded8c178657f082741b92830b3d (diff) | |
| parent | eda31f57fbda9e18080b368921d190d836abe3d6 (diff) | |
| download | php-git-ed84af4b882a4daf1a93386327853aab326ae67b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
| -rw-r--r-- | ext/phar/phar_object.c | 1 | ||||
| -rw-r--r-- | ext/phar/tests/bug69958.phpt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index b080e65b07..46c3d7cb34 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -2129,6 +2129,7 @@ static zval *phar_rename_archive(phar_archive_data **sphar, char *ext, zend_bool phar_destroy_phar_data(phar TSRMLS_CC); *sphar = NULL; phar = *pphar; + *sphar = NULL; phar->refcount++; newpath = oldpath; goto its_ok; diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt index d63b413c29..96f2198b14 100644 --- a/ext/phar/tests/bug69958.phpt +++ b/ext/phar/tests/bug69958.phpt @@ -1,5 +1,7 @@ --TEST-- Phar: bug #69958: Segfault in Phar::convertToData on invalid file +--XFAIL-- +Still has memory leaks, see https://bugs.php.net/bug.php?id=70005 --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> --FILE-- |