[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_statement.c

[Antony Dovgal]

tony2001                Mon Dec 25 21:47:02 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/oci8   oci8_statement.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.16&r2=1.7.2.14.2.17&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.16 
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.17
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.16     Mon Dec 25 21:41:04 2006
+++ php-src/ext/oci8/oci8_statement.c   Mon Dec 25 21:47:02 2006
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_statement.c,v 1.7.2.14.2.16 2006/12/25 21:41:04 iliaa Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.17 2006/12/25 21:47:02 tony2001 Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -591,7 +591,8 @@
                                        outcol->storage_size4 *= 3;
                                        
                                        dynamic = OCI_DEFAULT;
-                                       buf = outcol->data = (text *) 
ecalloc(1, outcol->storage_size4);
+                                       buf = outcol->data = (text *) 
safe_emalloc(1, outcol->storage_size4, 0);
+                                       memset(buf, 0, outcol->storage_size4);
                                        break;
                        }
 
@@ -1312,11 +1313,13 @@
        }
        
        bind = emalloc(sizeof(php_oci_bind));
-       bind->array.elements            = (text *)ecalloc(1, max_table_length * 
sizeof(text) * (maxlength + 1));
+       bind->array.elements            = (text *)safe_emalloc(max_table_length 
* (maxlength + 1), sizeof(text), 0);
+       memset(bind->array.elements, 0, max_table_length * (maxlength + 1) * 
sizeof(text));
        bind->array.current_length      = 
zend_hash_num_elements(Z_ARRVAL_P(var));
        bind->array.old_length          = bind->array.current_length;
        bind->array.max_length          = maxlength;
-       bind->array.element_lengths     = ecalloc(1, max_table_length * 
sizeof(ub2));
+       bind->array.element_lengths     = safe_emalloc(max_table_length, 
sizeof(ub2), 0);
+       memset(bind->array.element_lengths, 0, max_table_length*sizeof(ub2));
        
        zend_hash_internal_pointer_reset(hash);
        
@@ -1367,7 +1370,8 @@
        bind->array.current_length      = 
zend_hash_num_elements(Z_ARRVAL_P(var));
        bind->array.old_length          = bind->array.current_length;
        bind->array.max_length          = sizeof(ub4);
-       bind->array.element_lengths     = ecalloc(1, max_table_length * 
sizeof(ub2));
+       bind->array.element_lengths     = safe_emalloc(max_table_length, 
sizeof(ub2), 0);
+       memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2));
        
        zend_hash_internal_pointer_reset(hash);
        for (i = 0; i < max_table_length; i++) {
@@ -1403,7 +1407,8 @@
        bind->array.current_length      = 
zend_hash_num_elements(Z_ARRVAL_P(var));
        bind->array.old_length          = bind->array.current_length;
        bind->array.max_length          = sizeof(double);
-       bind->array.element_lengths     = ecalloc(1, max_table_length * 
sizeof(ub2));
+       bind->array.element_lengths     = safe_emalloc(max_table_length, 
sizeof(ub2), 0);
+       memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2));
        
        zend_hash_internal_pointer_reset(hash);
        for (i = 0; i < max_table_length; i++) {
@@ -1439,7 +1444,8 @@
        bind->array.current_length      = 
zend_hash_num_elements(Z_ARRVAL_P(var));
        bind->array.old_length          = bind->array.current_length;
        bind->array.max_length          = sizeof(OCIDate);
-       bind->array.element_lengths     = ecalloc(1, max_table_length * 
sizeof(ub2));
+       bind->array.element_lengths     = safe_emalloc(max_table_length, 
sizeof(ub2), 0);
+       memset(bind->array.element_lengths, 0, max_table_length * sizeof(ub2));
 
        zend_hash_internal_pointer_reset(hash);
        for (i = 0; i < max_table_length; i++) {

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