cvs: php4 /ext/standard basic_functions.c
| From: | Rasmus Lerdorf | Date: | Wed, 02 Apr 2003 23:11:31 +0000 |
| Subject: | cvs: php4 /ext/standard basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19990@lists.php.net to get a copy of this message | ||
rasmus Wed Apr 2 18:11:31 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c
Log:
MFB: Fix unregister_tick_function crash
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.601 php4/ext/standard/basic_functions.c:1.602
--- php4/ext/standard/basic_functions.c:1.601 Wed Apr 2 11:51:39 2003
+++ php4/ext/standard/basic_functions.c Wed Apr 2 18:11:31 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.601 2003/04/02 16:51:39 cmv Exp $ */
+/* $Id: basic_functions.c,v 1.602 2003/04/02 23:11:31 rasmus Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2733,9 +2733,11 @@
zval **function;
user_tick_function_entry tick_fe;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &function)) {
+ if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &function)) {
WRONG_PARAM_COUNT;
}
+
+ if(!BG(user_tick_functions)) return;
if (Z_TYPE_PP(function) != IS_ARRAY) {
convert_to_string_ex(function);