diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-11-10 10:42:30 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-11-10 10:42:30 -0800 |
| commit | ad468d20b130c720020139b8d5f6601f6f3033ab (patch) | |
| tree | e417379bf61116a29909b8765e83afba562ba7a4 /Zend/zend_execute_API.c | |
| parent | 96a6f688cbedfc42b436c0937bc9b95ab13f31c0 (diff) | |
| parent | 7d69fa717956cd0261058ae6e2d3f5dae3cedcc7 (diff) | |
| download | php-git-ad468d20b130c720020139b8d5f6601f6f3033ab.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #68370 ("unset($this)" can make the program crash)
Fixed NEWS for 5.5
Fix opcache.revalidate_freq per-request behavior
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 7e2a3378da..9d4eebf010 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1761,13 +1761,6 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */ /*printf("Cache miss! Initialized %x\n", EG(active_symbol_table));*/ } ex->symbol_table = EG(active_symbol_table); - - if (ex->op_array->this_var != -1 && - !*EX_CV_NUM(ex, ex->op_array->this_var) && - EG(This)) { - *EX_CV_NUM(ex, ex->op_array->this_var) = (zval**)EX_CV_NUM(ex, ex->op_array->last_var + ex->op_array->this_var); - **EX_CV_NUM(ex, ex->op_array->this_var) = EG(This); - } for (i = 0; i < ex->op_array->last_var; i++) { if (*EX_CV_NUM(ex, i)) { zend_hash_quick_update(EG(active_symbol_table), |