cvs: ZendEngine2 / zend_execute_API.c

dmitry Fri Mar 3 12:06:44 2006 UTC Modified files: /ZendEngine2 zend_execute_API.c Log: Fixed incorrect backtrace type ("::" instead of "->") for __set()/__get() http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_execute_API.c?r1=1.364&r2=1.365&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.364 ZendEngine2/zend_execute_API.c:1.365 --- ZendEngine2/zend_execute_API.c:1.364 Sun Feb 26 11:57:14 2006 +++ ZendEngine2/zend_execute_API.c Fri Mar 3 12:06:44 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.364 2006/02/26 11:57:14 dmitry Exp $ */ +/* $Id: zend_execute_API.c,v 1.365 2006/03/03 12:06:44 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -638,6 +638,7 @@ execute_data = *EG(current_execute_data); EX(op_array) = NULL; EX(opline) = NULL; + EX(object) = NULL; } else { /* This only happens when we're called outside any execute()'s * It shouldn't be strictly necessary to NULL execute_data out, @@ -696,6 +697,7 @@ ce = &(EG(active_op_array)->scope); found = (*ce != NULL?SUCCESS:FAILURE); fci->object_pp = EG(This)?&EG(This):NULL; + EX(object) = EG(This); } else if (EG(active_op_array) && Z_UNILEN_PP(fci->object_pp) == sizeof("parent")-1 && ZEND_U_EQUAL(Z_TYPE_PP(fci->object_pp), Z_UNIVAL_PP(fci->object_pp), Z_UNILEN_PP(fci->object_pp), "parent", sizeof("parent")-1)) { @@ -709,6 +711,7 @@ ce = &(EG(active_op_array)->scope->parent); found = (*ce != NULL?SUCCESS:FAILURE); fci->object_pp = EG(This)?&EG(This):NULL; + EX(object) = EG(This); } else { zend_class_entry *scope; scope = EG(active_op_array) ? EG(active_op_array)->scope : NULL; @@ -721,6 +724,7 @@ instanceof_function(Z_OBJCE_P(EG(This)), scope TSRMLS_CC) && instanceof_function(scope, *ce TSRMLS_CC)) { fci->object_pp = &EG(This); + EX(object) = EG(This); } else { fci->object_pp = NULL; } @@ -862,6 +866,7 @@ EX(function_state).function = fci_cache->function_handler; calling_scope = fci_cache->calling_scope; fci->object_pp = fci_cache->object_pp; + EX(object) = fci->object_pp ? *fci->object_pp : NULL; } if (EX(function_state).function->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) {