archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Unwrap reference returns in cufa etc

Browse source
This commit is contained in:
Nikita Popov 2016-09-30 22:08:08 +02:00
parent e63443d825
commit 02ba9d71ab
4 changed files with 63 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Zend/tests/dynamic_call_to_ref_returning_function.phpt Normal file
View file

@ -0,0 +1,39 @@
--TEST--
When performing a dynamic call to a ret-by-ref function, the reference should be unwrapped
--FILE--
<?php
namespace Foo;
function &retRef($x) {
return $x;
}
var_dump(call_user_func('Foo\retRef', 42));
var_dump(call_user_func_array('Foo\retRef', [42]));
$closure = function &($x) {
return $x;
};
var_dump($closure->call(new class {}, 42));
var_dump((new \ReflectionFunction('Foo\retRef'))->invoke(42));
var_dump((new \ReflectionFunction('Foo\retRef'))->invokeArgs([42]));
class Bar {
function &method($x) {
return $x;
}
}
var_dump((new \ReflectionMethod('Foo\Bar', 'method'))->invoke(new Bar, 42));
var_dump((new \ReflectionMethod('Foo\Bar', 'method'))->invokeArgs(new Bar, [42]));
?>
--EXPECT--
int(42)
int(42)
int(42)
int(42)
int(42)
int(42)
int(42)

3
Zend/zend_closures.c
View file

@ -166,6 +166,9 @@ ZEND_METHOD(Closure, call)
} }
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(closure_result) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(closure_result) != IS_UNDEF) {
if (Z_ISREF(closure_result)) {
zend_unwrap_reference(&closure_result);
}
ZVAL_COPY_VALUE(return_value, &closure_result); ZVAL_COPY_VALUE(return_value, &closure_result);
} }

9
ext/reflection/php_reflection.c
View file

@ -1985,6 +1985,9 @@ ZEND_METHOD(reflection_function, invoke)
} }
if (Z_TYPE(retval) != IS_UNDEF) { if (Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
} }
@ -2048,6 +2051,9 @@ ZEND_METHOD(reflection_function, invokeArgs)
} }
if (Z_TYPE(retval) != IS_UNDEF) { if (Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
} }
@ -3323,6 +3329,9 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)
} }
if (Z_TYPE(retval) != IS_UNDEF) { if (Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
} }

12
ext/standard/basic_functions.c
View file

@ -4823,6 +4823,9 @@ PHP_FUNCTION(call_user_func)
fci.retval = &retval; fci.retval = &retval;
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
} }
@ -4846,6 +4849,9 @@ PHP_FUNCTION(call_user_func_array)
fci.retval = &retval; fci.retval = &retval;
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
@ -4880,6 +4886,9 @@ PHP_FUNCTION(forward_static_call)
} }
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }
} }
@ -4908,6 +4917,9 @@ PHP_FUNCTION(forward_static_call_array)
} }
if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) { if (zend_call_function(&fci, &fci_cache) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
if (Z_ISREF(retval)) {
zend_unwrap_reference(&retval);
}
ZVAL_COPY_VALUE(return_value, &retval); ZVAL_COPY_VALUE(return_value, &retval);
} }