Merge branch 'master' of git.php.net:php-src

weltling · weltling · commit 965ff1c9bb62 · 2016-05-01T13:23:57.000+02:00
diff --git a/Zend/tests/dynamic_fully_qualified_call.phpt b/Zend/tests/dynamic_fully_qualified_call.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Crash when using dynamic call syntax with fully qualified name in a namespace
+--FILE--
+<?php
+
+namespace Foo;
+try {
+    ('\bar')();
+} catch (\Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Call to undefined function bar()
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -871,6 +871,7 @@ zend_string *zend_resolve_non_class_name(
 
 	if (ZSTR_VAL(name)[0] == '\\') {
 		/* Remove \ prefix (only relevant if this is a string rather than a label) */
+		*is_fully_qualified = 1;
 		return zend_string_init(ZSTR_VAL(name) + 1, ZSTR_LEN(name) - 1, 0);
 	}
 
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
@@ -987,7 +987,7 @@ int php_posix_group_to_array(struct group *g, zval *array_group) /* {{{ */
 	array_init(&array_members);
 
 	add_assoc_string(array_group, "name", g->gr_name);
-	if (array_group->gr_passwd) {
+	if (g->gr_passwd) {
 		add_assoc_string(array_group, "passwd", g->gr_passwd);
 	} else {
 		add_assoc_null(array_group, "passwd");

Original file line number	Diff line number	Diff line change
`@@ -871,6 +871,7 @@ zend_string *zend_resolve_non_class_name(`
`871`	`871`
`872`	`872`	`if (ZSTR_VAL(name)[0] == '\\') {`
`873`	`873`	`/* Remove \ prefix (only relevant if this is a string rather than a label) */`
	`874`	`+ *is_fully_qualified = 1;`
`874`	`875`	`return zend_string_init(ZSTR_VAL(name) + 1, ZSTR_LEN(name) - 1, 0);`
`875`	`876`	`}`
`876`	`877`