summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-12-24 00:29:14 +0000
committerZeev Suraski <zeev@php.net>2000-12-24 00:29:14 +0000
commitcec94760fd43d625402ca96e967b0d8ad4edb276 (patch)
tree664834f1da064136fc8b93b76ab34e7ba8000dab /Zend/zend_execute_API.c
parent009064bc4d84ec469ad3fbf4679bb87d8f5d0518 (diff)
downloadphp-git-cec94760fd43d625402ca96e967b0d8ad4edb276.tar.gz
More aggressive protection in call_user_function_ex()
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 30159a6476..53bd1ab958 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -361,6 +361,9 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun
(*object_pp)->is_ref = 1;
}
+ if (object_pp && !*object_pp) {
+ object_pp = NULL;
+ }
if (object_pp) {
if (Z_TYPE_PP(object_pp) != IS_OBJECT) {
return FAILURE;