]> granicus.if.org Git - php/commitdiff
check if fci->object_pp points to NULL
authorAntony Dovgal <tony2001@php.net>
Mon, 21 May 2007 07:12:34 +0000 (07:12 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 21 May 2007 07:12:34 +0000 (07:12 +0000)
Zend/zend_execute_API.c

index 3ab20f0e2696008e8967e504df04c7e5f2f3686b..6009fea4f366001f3bc2745c8900e00018971e6a 100644 (file)
@@ -909,7 +909,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;
                }