diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 12 | ||||
| -rw-r--r-- | ext/standard/tests/general_functions/bug44487.phpt | 24 |
3 files changed, 34 insertions, 4 deletions
@@ -18,6 +18,8 @@ PHP NEWS again...). (Felipe) - Fixed bug #41828 (Failing to call RecursiveIteratorIterator::__construct() causes a sefault). (Etienne) +- Fixed bug #44487 (call_user_method_array issues a warning when throwing + an exception). (David Soria Parra) 06 Mar 2008, PHP 5.2.6RC2 - Fixed bug #44333 (SEGFAULT when using mysql_pconnect() with client_flags). 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)); } diff --git a/ext/standard/tests/general_functions/bug44487.phpt b/ext/standard/tests/general_functions/bug44487.phpt new file mode 100644 index 0000000000..10c52c6b3f --- /dev/null +++ b/ext/standard/tests/general_functions/bug44487.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #44487 (call_user_method_array issues a warning when throwing an exception) +--INI-- +error_reporting = E_ALL & ~E_DEPRECATED +--FILE-- +<?php + +class Foo +{ + public function test() + { + print 'test'; + throw new Exception(); + } +} + +try { + $bar = new Foo(); + call_user_method_array('test', $bar, array()) ; +} catch (Exception $e) { +} +?> +--EXPECT-- +test |