diff options
| author | Zeev Suraski <zeev@php.net> | 2000-12-23 12:54:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-12-23 12:54:42 +0000 |
| commit | f052eab681246c721d154f4859ca420ddd8d76d4 (patch) | |
| tree | 1b92a4a447fa8dd07575d5aec5c2de5650013a7b /Zend/zend_execute_API.c | |
| parent | 24361033edf4b64ef7be0c49b20bf4d31e5bf5c9 (diff) | |
| download | php-git-f052eab681246c721d154f4859ca420ddd8d76d4.tar.gz | |
Fix a possible crash bug in call_user_function_ex(), if the function is
in fact not a user function
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 8fe3ce1fb6..30159a6476 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -446,7 +446,7 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun EG(opline_ptr) = original_opline_ptr; } else { ALLOC_INIT_ZVAL(*retval_ptr_ptr); - ((zend_internal_function *) function_state.function)->handler(param_count, *retval_ptr_ptr, *object_pp, 1 ELS_CC); + ((zend_internal_function *) function_state.function)->handler(param_count, *retval_ptr_ptr, (object_pp?*object_pp:NULL), 1 ELS_CC); INIT_PZVAL(*retval_ptr_ptr); } zend_ptr_stack_clear_multiple(ELS_C); |