MFH: fix #39576 (array_walk() doesn't separate userdata zval)

1 files changed, 52 insertions, 0 deletions

diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt
new file mode 100644
index 0000000000..7c8aeef175
--- /dev/null
+++ b/ext/standard/tests/array/bug39576.phpt
@@ -0,0 +1,52 @@
+--TEST--
+Bug #39576 (array_walk() doesn't separate userdata zval)
+--FILE--
+<?php
+
+class Test {
+
+	public $_table = '';
+	public $_columns = array ();
+	public $_primary = array ();
+
+}
+
+$test = new Test ();
+$test->name = 'test';
+$test->_columns['name'] = new stdClass;
+
+function test ($value, $column, &$columns) {}
+
+array_walk (
+	get_object_vars ($test),
+	'test',
+	$test->_columns
+);
+
+var_dump($test);
+
+array_intersect_key (
+	get_object_vars ($test),
+	$test->_primary
+);
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Strict Standards: Only variables should be passed by reference in %s on line %d
+object(Test)#%d (4) {
+  ["_table"]=>
+  string(0) ""
+  ["_columns"]=>
+  array(1) {
+    ["name"]=>
+    object(stdClass)#%d (0) {
+    }
+  }
+  ["_primary"]=>
+  array(0) {
+  }
+  ["name"]=>
+  string(4) "test"
+}
+Done