Merge branch 'PHP-5.6'

nikic · nikic · commit c59292570cd6 · 2014-08-30T20:45:10.000+02:00
Conflicts:
	Zend/zend_compile.c
diff --git a/Zend/tests/bug67938.phpt b/Zend/tests/bug67938.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #67938: Segfault when extending interface method with variadic
+--FILE--
+<?php
+
+interface TestInterface {
+    public function foo();
+    public function bar(array $bar);
+}
+
+class Test implements TestInterface {
+    public function foo(...$args) {
+        echo __METHOD__, "\n";
+    }
+    public function bar(array $bar, ...$args) {
+        echo __METHOD__, "\n";
+    }
+}
+
+$obj = new Test;
+$obj->foo();
+$obj->bar([]);
+
+?>
+--EXPECT--
+Test::foo
+Test::bar
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1121,7 +1121,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 	 * go through all the parameters of the function and not just those present in the
 	 * prototype. */
 	num_args = proto->common.num_args;
-	if ((fe->common.fn_flags & ZEND_ACC_VARIADIC)
+	if ((proto->common.fn_flags & ZEND_ACC_VARIADIC)
 		&& fe->common.num_args > proto->common.num_args) {
 		num_args = fe->common.num_args;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c`
`1121`	`1121`	`* go through all the parameters of the function and not just those present in the`
`1122`	`1122`	`* prototype. */`
`1123`	`1123`	`num_args = proto->common.num_args;`
`1124`		`- if ((fe->common.fn_flags & ZEND_ACC_VARIADIC)`
	`1124`	`+ if ((proto->common.fn_flags & ZEND_ACC_VARIADIC)`
`1125`	`1125`	`&& fe->common.num_args > proto->common.num_args) {`
`1126`	`1126`	`num_args = fe->common.num_args;`
`1127`	`1127`	`}`