com php-src: Better fix for bug #69958: ext/phar/phar_object .c ext/phar/tests/bug69958.phpt
| From: | Stanislav Malyshev | Date: | Tue, 07 Jul 2015 07:01:26 +0000 |
| Subject: | com php-src: Better fix for bug #69958: ext/phar/phar_object .c ext/phar/tests/bug69958.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87810@lists.php.net to get a copy of this message | ||
Commit: eda31f57fbda9e18080b368921d190d836abe3d6
Author: Stanislav Malyshev <stas@php.net> Mon, 6 Jul 2015 22:58:28 -0700
Parents: c938d2f537c81c5162edcda330d2081b09077030
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eda31f57fbda9e18080b368921d190d836abe3d6
Log:
Better fix for bug #69958
Bugs:
https://bugs.php.net/69958
Changed paths:
M ext/phar/phar_object.c
M ext/phar/tests/bug69958.phpt
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 1184863..8cfe0c8 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -2089,9 +2089,10 @@ static int phar_copy_file_contents(phar_entry_info *entry, php_stream *fp
TSRMLS
}
/* }}} */
-static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC)
/* {{{ */
+static zval *phar_rename_archive(phar_archive_data **sphar, char *ext, zend_bool compress
TSRMLS_DC) /* {{{ */
{
const char *oldname = NULL;
+ phar_archive_data *phar = *sphar;
char *oldpath = NULL;
char *basename = NULL, *basepath = NULL;
char *newname = NULL, *newpath = NULL;
@@ -2199,6 +2200,7 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool
c
phar->fp = NULL;
phar_destroy_phar_data(phar TSRMLS_CC);
phar = *pphar;
+ *sphar = NULL;
phar->refcount++;
newpath = oldpath;
goto its_ok;
@@ -2413,17 +2415,19 @@ no_copy:
phar_add_virtual_dirs(phar, newentry.filename, newentry.filename_len TSRMLS_CC);
}
- if ((ret = phar_rename_archive(phar, ext, 0 TSRMLS_CC))) {
+ if ((ret = phar_rename_archive(&phar, ext, 0 TSRMLS_CC))) {
return ret;
} else {
- zend_hash_destroy(&(phar->manifest));
- zend_hash_destroy(&(phar->mounted_dirs));
- zend_hash_destroy(&(phar->virtual_dirs));
- if (phar->fp) {
- php_stream_close(phar->fp);
+ if(phar != NULL) {
+ zend_hash_destroy(&(phar->manifest));
+ zend_hash_destroy(&(phar->mounted_dirs));
+ zend_hash_destroy(&(phar->virtual_dirs));
+ if (phar->fp) {
+ php_stream_close(phar->fp);
+ }
+ efree(phar->fname);
+ efree(phar);
}
- efree(phar->fname);
- efree(phar);
return NULL;
}
}
diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt
index d63b413..96f2198 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--