[PHP-CVS] cvs: php4(PHP_4_3) / TODO_SEGFAULTS /ext/standard basic_functions.c

[Rasmus Lerdorf]

rasmus          Wed Apr  2 18:09:39 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4       TODO_SEGFAULTS 
    /php4/ext/standard  basic_functions.c 
  Log:
  Fix unregister_tick_function crash
  
  
Index: php4/TODO_SEGFAULTS
diff -u php4/TODO_SEGFAULTS:1.1.2.9 php4/TODO_SEGFAULTS:1.1.2.10
--- php4/TODO_SEGFAULTS:1.1.2.9 Wed Apr  2 16:31:52 2003
+++ php4/TODO_SEGFAULTS Wed Apr  2 18:09:39 2003
@@ -11,6 +11,7 @@
        array_pad (Rasmus)
        str_repeat (Ilia)
     setlocale (Rasmus)
+    unregister_tick_function (Rasmus)
 
 Open:
 
@@ -20,8 +21,7 @@
     mb_eregi (2)
     mb_split
     ob_start (3)
-    unregister_tick_function
-    xml_parser_create
+    xml_parser_create (Unable to reproduce - Rasmus)
 
     Notes:
 
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.543.2.10 
php4/ext/standard/basic_functions.c:1.543.2.11
--- php4/ext/standard/basic_functions.c:1.543.2.10      Tue Apr  1 05:03:19 2003
+++ php4/ext/standard/basic_functions.c Wed Apr  2 18:09:39 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.543.2.10 2003/04/01 10:03:19 sas Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.11 2003/04/02 23:09:39 rasmus Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -2672,9 +2672,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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php