]> granicus.if.org Git - php/commitdiff
MFH
authorAntony Dovgal <tony2001@php.net>
Mon, 21 May 2007 07:12:41 +0000 (07:12 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 21 May 2007 07:12:41 +0000 (07:12 +0000)
Zend/zend_execute_API.c

index e49f9f5f3d774e3913622e0aeb8c5374e6efab36..e0b44c6587dcb224811f0d722dceeb46cfe11b71 100644 (file)
@@ -843,7 +843,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                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;
                }