summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-12-21 12:09:24 +0100
committerAnatol Belski <ab@php.net>2015-12-21 12:09:24 +0100
commit53bfb6618d13083b769014cbdcb845f787a7cf28 (patch)
treebac3dc8d8fdaa316f989945551ebabc6e1cd1b65
parent4531d2c5913eddbbc38d04be6b2dffec30202887 (diff)
downloadphp-git-53bfb6618d13083b769014cbdcb845f787a7cf28.tar.gz
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.
-rw-r--r--Zend/zend.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 3a52200671..d211f14d0f 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;