clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve previous fix

Browse Source 
Don't forbid null binding on plain functions.
This commit is contained in:
Nikita Popov 2015-10-09 23:28:24 +02:00
parent bbae7ddf29
commit e19423f3cb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zend/tests/bug70681.phpt
View File

@ -6,6 +6,11 @@ Bug #70681: Segfault when binding $this of internal instance method to null
$c = (new ReflectionMethod('SplStack', 'count'))->getClosure(new SplStack);
$c = $c->bindTo(null);
$c = (new ReflectionFunction('strlen'))->getClosure();
$c = $c->bindTo(null);
var_dump($c("foo"));
?>
--EXPECTF--
Warning: Cannot unbind $this of internal method in %s on line %d
int(3)

2
Zend/zend_closures.c
View File

@ -89,7 +89,7 @@ ZEND_METHOD(Closure, bind)
}
if (newthis == NULL && !(closure->func.common.fn_flags & ZEND_ACC_STATIC)
&& closure->func.type == ZEND_INTERNAL_FUNCTION) {
&& closure->func.common.scope && closure->func.type == ZEND_INTERNAL_FUNCTION) {
zend_error(E_WARNING, "Cannot unbind $this of internal method");
return;
}