From c2cfed1b3290de61a1ff39c7bcc8c1a024445043 Mon Sep 17 00:00:00 2001
From: Jani Taskinen <jani@php.net>
Date: Fri, 2 Nov 2007 19:42:51 +0000
Subject: [PATCH] - Add missing tests from HEAD

---
 .../tests/general_functions/bug41970.phpt     | 24 ++++++++++
 .../call_user_func_return.phpt                | 44 +++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 ext/standard/tests/general_functions/bug41970.phpt
 create mode 100755 ext/standard/tests/general_functions/call_user_func_return.phpt

diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt
new file mode 100644
index 0000000000..cc942ffa64
--- /dev/null
+++ b/ext/standard/tests/general_functions/bug41970.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #41970 (call_user_func_*() leaks on failure)
+--FILE--
+<?php
+
+$a = array(4,3,2);
+
+var_dump(call_user_func_array("sort", array($a)));
+var_dump(call_user_func_array("strlen", array($a)));
+var_dump(call_user_func("sort", $a));
+var_dump(call_user_func("strlen", $a));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+NULL
+
+Notice: Array to string conversion in %s on line %d
+int(5)
+NULL
+
+Notice: Array to string conversion in %s on line %d
+int(5)
+Done
diff --git a/ext/standard/tests/general_functions/call_user_func_return.phpt b/ext/standard/tests/general_functions/call_user_func_return.phpt
new file mode 100755
index 0000000000..929fdd7e35
--- /dev/null
+++ b/ext/standard/tests/general_functions/call_user_func_return.phpt
@@ -0,0 +1,44 @@
+--TEST--
+call_user_func() and return value
+--FILE--
+<?php
+
+$t1 = 'test1';
+
+function test1($arg1, $arg2)
+{
+	global $t1;
+	echo "$arg1 $arg2\n";
+	return $t1;
+}
+
+$t2 = 'test2';
+
+function & test2($arg1, $arg2)
+{
+	global $t2;
+	echo "$arg1 $arg2\n";
+	return $t2;
+}
+
+function test($func)
+{
+	debug_zval_dump($func('Direct', 'Call'));
+	debug_zval_dump(call_user_func_array($func, array('User', 'Func')));
+}
+
+test('test1');
+test('test2');
+
+?>
+===DONE===
+--EXPECTF--
+Direct Call
+string(5) "test1" refcount(1)
+User Func
+string(5) "test1" refcount(1)
+Direct Call
+string(5) "test2" refcount(2)
+User Func
+string(5) "test2" refcount(1)
+===DONE===
-- 
2.50.1