cvs: ZendEngine2 / zend_execute_API.c

tony2001 Mon May 21 07:12:34 2007 UTC Modified files: /ZendEngine2 zend_execute_API.c Log: check if fci->object_pp points to NULL http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.401&r2=1.402&diff_format=u Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.401 ZendEngine2/zend_execute_API.c:1.402 --- ZendEngine2/zend_execute_API.c:1.401 Fri May 18 11:51:40 2007 +++ ZendEngine2/zend_execute_API.c Mon May 21 07:12:34 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.401 2007/05/18 11:51:40 tony2001 Exp $ */ +/* $Id: zend_execute_API.c,v 1.402 2007/05/21 07:12:34 tony2001 Exp $ */ #include <stdio.h> #include <signal.h> @@ -909,7 +909,7 @@ calling_scope = fci_cache->calling_scope; fci->object_pp = fci_cache->object_pp; EX(object) = fci->object_pp ? *fci->object_pp : NULL; - if (fci->object_pp && Z_TYPE_PP(fci->object_pp) == IS_OBJECT + if (fci->object_pp && *fci->object_pp && Z_TYPE_PP(fci->object_pp) == IS_OBJECT && (!EG(objects_store).object_buckets || !EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(fci->object_pp)].valid)) { return FAILURE; }