com php-src: Revert "Partially fix bug #71129": Zend/zend.c
| From: | Anatol Belski | Date: | Mon, 21 Dec 2015 11:09:24 +0000 |
| Subject: | com php-src: Revert "Partially fix bug #71129": Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90366@lists.php.net to get a copy of this message | ||
Commit: 53bfb6618d13083b769014cbdcb845f787a7cf28
Author: Anatol Belski <ab@php.net> Mon, 21 Dec 2015 12:09:24 +0100
Parents: 4531d2c5913eddbbc38d04be6b2dffec30202887
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=53bfb6618d13083b769014cbdcb845f787a7cf28
Log:
Revert "Partially fix bug #71129"
This reverts commit 4c55669caa96f6202c2047a7baf6c5d5894d5fa7.
The way it is fixes doesn't satisfy every SAPI, so a better solution
is yet to work out.
Bugs:
https://bugs.php.net/71129
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 3a52200..d211f14 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -448,11 +448,7 @@ static void zend_init_call_trampoline_op(void) /* {{{ */
static void auto_global_dtor(zval *zv) /* {{{ */
{
- zend_auto_global *ag = Z_PTR_P(zv);
-
- zend_string_release(ag->name);
-
- free(ag);
+ free(Z_PTR_P(zv));
}
/* }}} */
@@ -471,7 +467,7 @@ static void auto_global_copy_ctor(zval *zv) /* {{{ */
zend_auto_global *old_ag = (zend_auto_global *) Z_PTR_P(zv);
zend_auto_global *new_ag = pemalloc(sizeof(zend_auto_global), 1);
- new_ag->name = zend_string_dup(old_ag->name, 1);
+ new_ag->name = old_ag->name;
new_ag->auto_global_callback = old_ag->auto_global_callback;
new_ag->jit = old_ag->jit;