Skip to content

Ban rebinding closures to different internal classes #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Ban rebinding closures to different internal classes #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Zend/tests/closure_call.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ $beta = function ($z) {
};

// Ensure argument passing works
var_dump($beta->call($elePHPant, 3));
var_dump($beta->call($foobar, 7));

// Ensure ->call calls with scope of passed object
class FooBar {
Expand All @@ -56,10 +56,12 @@ $foo = function () {
$foo->call(new FooBar);

?>
--EXPECT--
--EXPECTF--
int(0)
int(0)
int(3)
int(7)

Warning: Cannot bind closure to object of internal class stdClass in %s line %d
NULL
int(21)
int(3)
int(3)
16 changes: 15 additions & 1 deletion Zend/zend_closures.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ ZEND_METHOD(Closure, call)
zval *my_params;
int my_param_count = 0;
zend_function my_function;
zend_object *newobj;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "o*", &newthis, &my_params, &my_param_count) == FAILURE) {
return;
Expand All @@ -101,6 +102,14 @@ ZEND_METHOD(Closure, call)
}
}

newobj = Z_OBJ_P(newthis);

if (newobj->ce != closure->func.common.scope && newobj->ce->type == ZEND_INTERNAL_CLASS) {
/* rebinding to internal class is not allowed */
zend_error(E_WARNING, "Cannot bind closure to object of internal class %s", newobj->ce->name->val);
return;
}

/* This should never happen as closures will always be callable */
if (zend_fcall_info_init(zclosure, 0, &fci, &fci_cache, NULL, NULL) != SUCCESS) {
ZEND_ASSERT(0);
Expand All @@ -109,7 +118,7 @@ ZEND_METHOD(Closure, call)
fci.retval = &closure_result;
fci.params = my_params;
fci.param_count = my_param_count;
fci.object = fci_cache.object = Z_OBJ_P(newthis);
fci.object = fci_cache.object = newobj;
fci_cache.initialized = 1;

my_function = *fci_cache.function_handler;
Expand Down Expand Up @@ -157,6 +166,11 @@ ZEND_METHOD(Closure, bind)
}
zend_string_release(class_name);
}
if(ce && ce != closure->func.common.scope && ce->type == ZEND_INTERNAL_CLASS) {
/* rebinding to internal class is not allowed */
zend_error(E_WARNING, "Cannot bind closure to scope of internal class %s", ce->name->val);
return;
}
} else { /* scope argument not given; do not change the scope by default */
ce = closure->func.common.scope;
}
Expand Down