com php-src: Fix $this CV init for include/eval: Zend/tests/bug68148.phpt Zend/zend_execute.c

Commit: 58f389772f19ef604ad151407c7f878fadea6c5f Author: Nikita Popov <nikic@php.net> Sun, 5 Oct 2014 23:38:59 +0200 Parents: 9bc14f9632739274d7d3430759f77f272bf63241 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58f389772f19ef604ad151407c7f878fadea6c5f Log: Fix $this CV init for include/eval Fixes bug #68148 Bugs: https://bugs.php.net/68148 Changed paths: A Zend/tests/bug68148.phpt M Zend/zend_execute.c Diff: diff --git a/Zend/tests/bug68148.phpt b/Zend/tests/bug68148.phpt new file mode 100644 index 0000000..fcbf69b --- /dev/null +++ b/Zend/tests/bug68148.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #68148: $this is null inside include +--FILE-- +<?php + +class Test { + public function method() { + eval('var_dump($this);'); + } +} + +(new Test)->method(); + +?> +--EXPECT-- +object(Test)#1 (0) { +} diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 45911a8..e6e0176 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) {