Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)

laruence · laruence · commit 823e330c75a7 · 2013-11-17T17:04:37.000+08:00
diff --git a/NEWS b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2013, PHP 5.4.23
 
 - Core:
+  . Fixed bug #66094 (unregister_tick_function tries to cast a Closure to a 
+    string). (Laruence)
   . Fixed bug #65947 (basename is no more working after fgetcsv in certain 
     situation). (Laruence)
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -5724,7 +5724,7 @@ PHP_FUNCTION(unregister_tick_function)
 		return;
 	}
 
-	if (Z_TYPE_P(function) != IS_ARRAY) {
+	if (Z_TYPE_P(function) != IS_ARRAY && Z_TYPE_P(function) != IS_OBJECT) {
 		convert_to_string(function);
 	}
 
diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
+--FILE--
+<?php
+declare(ticks=1);
+register_tick_function($closure = function () { echo "Tick!\n"; });
+unregister_tick_function($closure);
+echo "done";
+?>
+--EXPECTF--	
+Tick!
+done

Original file line number	Diff line number	Diff line change
`@@ -5724,7 +5724,7 @@ PHP_FUNCTION(unregister_tick_function)`
`5724`	`5724`	`return;`
`5725`	`5725`	`}`
`5726`	`5726`
`5727`		`- if (Z_TYPE_P(function) != IS_ARRAY) {`
	`5727`	`+ if (Z_TYPE_P(function) != IS_ARRAY && Z_TYPE_P(function) != IS_OBJECT) {`
`5728`	`5728`	`convert_to_string(function);`
`5729`	`5729`	`}`
`5730`	`5730`