diff options
| author | Nikita Popov <nikic@php.net> | 2014-10-05 23:38:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-10-05 23:38:59 +0200 |
| commit | 58f389772f19ef604ad151407c7f878fadea6c5f (patch) | |
| tree | ca458ae69e32132d00868ec8de780f784ee24dc1 /Zend/zend_execute.c | |
| parent | 9bc14f9632739274d7d3430759f77f272bf63241 (diff) | |
| download | php-git-58f389772f19ef604ad151407c7f878fadea6c5f.tar.gz | |
Fix $this CV init for include/eval
Fixes bug #68148
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 45911a8a99..e6e0176058 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1506,6 +1506,11 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu zend_attach_symbol_table(execute_data); + if (op_array->this_var != -1 && Z_OBJ(EX(This))) { + ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This))); + GC_REFCOUNT(Z_OBJ(EX(This)))++; + } + if (!op_array->run_time_cache && op_array->last_cache_slot) { op_array->run_time_cache = ecalloc(op_array->last_cache_slot, sizeof(void*)); } @@ -1573,11 +1578,11 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da var++; } while (var != end); } + } - if (op_array->this_var != -1 && Z_OBJ(EX(This))) { - ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This))); - GC_REFCOUNT(Z_OBJ(EX(This)))++; - } + if (op_array->this_var != -1 && Z_OBJ(EX(This))) { + ZVAL_OBJ(EX_VAR(op_array->this_var), Z_OBJ(EX(This))); + GC_REFCOUNT(Z_OBJ(EX(This)))++; } if (!op_array->run_time_cache && op_array->last_cache_slot) { |