com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/phar _object.c
| From: | Stanislav Malyshev | Date: | Tue, 07 Jul 2015 07:01:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/phar _object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87809@lists.php.net to get a copy of this message | ||
Commit: ed84af4b882a4daf1a93386327853aab326ae67b
Author: Stanislav Malyshev <stas@php.net> Tue, 7 Jul 2015 00:01:42 -0700
Parents: 09de64a58dd1dded8c178657f082741b92830b3d eda31f57fbda9e18080b368921d190d836abe3d6
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed84af4b882a4daf1a93386327853aab326ae67b
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for bug #69958
Bugs:
https://bugs.php.net/69958
Changed paths:
MM ext/phar/phar_object.c
Diff:
diff --cc ext/phar/phar_object.c
index b080e65,8cfe0c8..46c3d7c
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -2127,8 -2199,8 +2127,9 @@@ static zval *phar_rename_archive(phar_a
(*pphar)->fp = phar->fp;
phar->fp = NULL;
phar_destroy_phar_data(phar TSRMLS_CC);
+ *sphar = NULL;
phar = *pphar;
+ *sphar = NULL;
phar->refcount++;
newpath = oldpath;
goto its_ok;