diff options
author | Antony Dovgal <tony2001@php.net> | 2007-05-21 07:12:41 +0000 |
---|---|---|
committer | Antony Dovgal <tony2001@php.net> | 2007-05-21 07:12:41 +0000 |
commit | 04aefb4e18f16878e004f036ca82905785c346b1 (patch) | |
tree | 7aa584bab64e9f2aad834fce60ce08f26387c662 /Zend/zend_execute_API.c | |
parent | a4e3f29771a9e7ed26a6ff18782c3146b931427b (diff) | |
download | php-git-04aefb4e18f16878e004f036ca82905785c346b1.tar.gz |
MFH
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index e49f9f5f3d..e0b44c6587 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -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; } |