]> granicus.if.org Git - php/commitdiff
Internal functions may return (e.g. on wrong arguments) keeping the original return_v...
authorDmitry Stogov <dmitry@zend.com>
Thu, 6 Mar 2014 09:32:43 +0000 (13:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 6 Mar 2014 09:32:43 +0000 (13:32 +0400)
Zend/zend_execute_API.c

index fb214dba100c842e19b9a46721c5b3f66a2416ac..7ddb5264210724926c8a71d2d067bc66cd62f7c8 100644 (file)
@@ -932,7 +932,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                EG(opline_ptr) = original_opline_ptr;
        } else if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
                int call_via_handler = (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0;
-//???          ALLOC_INIT_ZVAL(*fci->retval_ptr_ptr);
+               ZVAL_NULL(fci->retval);
                if (EX(function_state).function->common.scope) {
                        EG(scope) = EX(function_state).function->common.scope;
                }