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

[Moriyoshi Koizumi]

moriyoshi               Fri Jan  3 00:12:06 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  array.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.199.2.11 php4/ext/standard/array.c:1.199.2.12
--- php4/ext/standard/array.c:1.199.2.11        Tue Dec 31 11:35:24 2002
+++ php4/ext/standard/array.c   Fri Jan  3 00:12:06 2003
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.199.2.11 2002/12/31 16:35:24 sebastian Exp $ */
+/* $Id: array.c,v 1.199.2.12 2003/01/03 05:12:06 moriyoshi Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -3328,6 +3328,8 @@
                WRONG_PARAM_COUNT;
        }
 
+       RETVAL_NULL();
+
        callback = *args[0];
        if (Z_TYPE_P(callback) != IS_NULL) {
                if (!zend_is_callable(callback, 0, &callback_name)) {
@@ -3348,6 +3350,7 @@
                if (Z_TYPE_PP(args[i+1]) != IS_ARRAY) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #%d 
should be an array", i + 2);
                        efree(array_len);
+                       efree(array_pos);
                        efree(args);
                        return;
                }



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