From 55bca5868aabe15cd08d763ee945cfb23bef69cb Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 24 Feb 2014 17:07:44 +0400 Subject: [PATCH] Fixed $this handling --- Zend/zend_execute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 4060ee0b14..996ffec659 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1654,12 +1654,12 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array if (op_array->this_var != -1 && Z_TYPE(EG(This)) != IS_UNDEF) { if (!EG(active_symbol_table)) { - ZVAL_COPY(EX_VAR(op_array->this_var), &EG(This)); + ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This)); } else { - ZVAL_COPY(EX_VAR(op_array->this_var), &EG(This)); + ZVAL_COPY(EX_VAR_NUM(op_array->this_var), &EG(This)); zval *zv = zend_hash_str_add(EG(active_symbol_table), "this", sizeof("this")-1, EX_VAR(op_array->this_var)); if (zv) { - Z_ADDREF(EG(This)); + ZVAL_INDIRECT(EX_VAR_NUM(op_array->this_var), zv); } } } -- 2.40.0