diff options
| author | David Soria Parra <dsp@php.net> | 2008-03-20 00:55:26 +0000 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2008-03-20 00:55:26 +0000 |
| commit | bb4e8b10e3f4e86a99d39df6340648f063e65e3d (patch) | |
| tree | 0ea9515096192945d6ed40f5b3d07a81f2d1f989 /ext/standard/basic_functions.c | |
| parent | bc8c6498780fe45e4ed24a0eaa83caa684a84f46 (diff) | |
| download | php-git-bb4e8b10e3f4e86a99d39df6340648f063e65e3d.tar.gz | |
MFH: Fix bug #44487 (call_user_method_array issues a warning when throwing an exception).
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7a07b0a612..cec0b1f636 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5219,8 +5219,10 @@ PHP_FUNCTION(call_user_method) SEPARATE_ZVAL(params[0]); convert_to_string(*params[0]); - if (call_user_function_ex(EG(function_table), params[1], *params[0], &retval_ptr, arg_count-2, params+2, 0, NULL TSRMLS_CC) == SUCCESS && retval_ptr) { - COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); + if (call_user_function_ex(EG(function_table), params[1], *params[0], &retval_ptr, arg_count-2, params+2, 0, NULL TSRMLS_CC) == SUCCESS) { + if (retval_ptr) { + COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); + } } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call %s()", Z_STRVAL_PP(params[0])); } @@ -5261,8 +5263,10 @@ PHP_FUNCTION(call_user_method_array) element++; } - if (call_user_function_ex(EG(function_table), obj, *method_name, &retval_ptr, num_elems, method_args, 0, NULL TSRMLS_CC) == SUCCESS && retval_ptr) { - COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); + if (call_user_function_ex(EG(function_table), obj, *method_name, &retval_ptr, num_elems, method_args, 0, NULL TSRMLS_CC) == SUCCESS) { + if (retval_ptr) { + COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr); + } } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call %s()", Z_STRVAL_PP(method_name)); } |