diff options
| author | Anatol Belski <ab@php.net> | 2015-12-20 15:27:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-12-20 15:27:13 +0100 |
| commit | 6f4286f303d4238d3b44f6e4046071ddda379b6b (patch) | |
| tree | 98c6955bc08fe5e14a119f62f4a0cc05db6af515 /Zend/zend.c | |
| parent | 420ff42bc0339df78817fdb04f240f86cd32ef61 (diff) | |
| parent | 4c55669caa96f6202c2047a7baf6c5d5894d5fa7 (diff) | |
| download | php-git-6f4286f303d4238d3b44f6e4046071ddda379b6b.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Partially fix bug #71129
Typo
Bug #71105 was fixed in 7.0.1 (commit 9374ba35)
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 3bea725d08..1bf4f2dc3e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -448,7 +448,11 @@ static void zend_init_call_trampoline_op(void) /* {{{ */ static void auto_global_dtor(zval *zv) /* {{{ */ { - free(Z_PTR_P(zv)); + zend_auto_global *ag = Z_PTR_P(zv); + + zend_string_release(ag->name); + + free(ag); } /* }}} */ @@ -467,7 +471,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 = old_ag->name; + new_ag->name = zend_string_dup(old_ag->name, 1); new_ag->auto_global_callback = old_ag->auto_global_callback; new_ag->jit = old_ag->jit; |