[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard var.c

[Jani Taskinen]

sniper          Thu Feb  5 07:19:33 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       var.c 
  Log:
  MFH: emalloc -> safe_emalloc
  
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.150.2.13&r2=1.150.2.14&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.150.2.13 php-src/ext/standard/var.c:1.150.2.14
--- php-src/ext/standard/var.c:1.150.2.13       Fri Nov 28 23:43:11 2003
+++ php-src/ext/standard/var.c  Thu Feb  5 07:19:32 2004
@@ -136,7 +136,7 @@
        
        argc = ZEND_NUM_ARGS();
        
-       args = (zval ***)emalloc(argc * sizeof(zval **));
+       args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
        if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == 
FAILURE) {
                efree(args);
                WRONG_PARAM_COUNT;
@@ -234,7 +234,7 @@
        
        argc = ZEND_NUM_ARGS();
        
-       args = (zval ***)emalloc(argc * sizeof(zval **));
+       args = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
        if (ZEND_NUM_ARGS() == 0 || zend_get_parameters_array_ex(argc, args) == 
FAILURE) {
                efree(args);
                WRONG_PARAM_COUNT;

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