From: Nikita Popov <nikic@php.net>
Date: Fri, 9 Oct 2015 21:28:24 +0000 (+0200)
Subject: Improve previous fix
X-Git-Tag: php-5.6.15RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e19423f3cbeaf2ac57a4af1e7c5b84fc6721177b;p=php

Improve previous fix

Don't forbid null binding on plain functions.
---

diff --git a/Zend/tests/bug70681.phpt b/Zend/tests/bug70681.phpt
index a99180b0ce..9dd09b07b8 100644
--- a/Zend/tests/bug70681.phpt
+++ b/Zend/tests/bug70681.phpt
@@ -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)
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 772eb12ecc..582a1f7784 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -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;
 	}