More aggressive protection in call_user_function_ex()

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 30159a64769491d1bf4e86ae993622da93c46398..53bd1ab958e3ea073e2c26f2545d2e86be0611fa 100644 (file)
--- 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;