cvs: ZendEngine2(PHP_5_1) / zend_execute_API.c

dmitry Fri Mar 3 12:06:29 2006 UTC Modified files: (Branch: PHP_5_1) /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.331.2.15&r2=1.331.2.16&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.331.2.15 ZendEngine2/zend_execute_API.c:1.331.2.16 --- ZendEngine2/zend_execute_API.c:1.331.2.15 Sun Feb 26 10:53:38 2006 +++ ZendEngine2/zend_execute_API.c Fri Mar 3 12:06:29 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.331.2.15 2006/02/26 10:53:38 helly Exp $ */ +/* $Id: zend_execute_API.c,v 1.331.2.16 2006/03/03 12:06:29 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -608,6 +608,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, @@ -663,6 +664,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 (strcmp(Z_STRVAL_PP(fci->object_pp), "parent") == 0 && EG(active_op_array)) { if (!EG(active_op_array)->scope) { @@ -674,6 +676,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; @@ -686,6 +689,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; } @@ -802,6 +806,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)) {