From: Antony Dovgal <tony2001@php.net>
Date: Mon, 21 May 2007 07:12:34 +0000 (+0000)
Subject: check if fci->object_pp points to NULL
X-Git-Tag: RELEASE_1_4~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52587a3d5c9069062aa551db21072eaae133efc5;p=php

check if fci->object_pp points to NULL
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 3ab20f0e26..6009fea4f3 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -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;
 		}