tony2001 Mon Dec 25 21:45:09 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_statement.c
Log:
use safe_emalloc()
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.37
php-src/ext/oci8/oci8_statement.c:1.38
--- php-src/ext/oci8/oci8_statement.c:1.37 Thu Nov 23 15:23:10 2006
+++ php-src/ext/oci8/oci8_statement.c Mon Dec 25 21:45:09 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_statement.c,v 1.37 2006/11/23 15:23:10 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.38 2006/12/25 21:45:09 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -96,7 +96,7 @@
}
if (query.s && query_len) {
- statement->last_query = emalloc(USTR_BYTES(type, query_len +
1));
+ statement->last_query = safe_emalloc(1, USTR_BYTES(type,
query_len + 1), 0);
memcpy(statement->last_query, query.s, USTR_BYTES(type,
query_len));
statement->last_query[USTR_BYTES(type, query_len)] = '\0';
statement->last_query_len = query_len;
@@ -604,7 +604,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;
}
@@ -1379,14 +1380,17 @@
bind = emalloc(sizeof(php_oci_bind));
if (UG(unicode)) {
- bind->array.elements = (UChar *)ecalloc(1,
max_table_length * sizeof(UChar) * (maxlength + 1));
+ bind->array.elements = (UChar
*)safe_emalloc(max_table_length * (maxlength + 1), sizeof(UChar), 0);
+ memset(bind->array.elements, 0, max_table_length *
sizeof(UChar) * (maxlength + 1));
} else {
- 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 * sizeof(text)
* (maxlength + 1));
}
bind->array.current_length =
zend_hash_num_elements(Z_ARRVAL_P(var));
bind->array.old_length = bind->array.current_length;
bind->array.max_length = TEXT_BYTES(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);
@@ -1437,11 +1441,12 @@
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
- bind->array.elements = (ub4 *)emalloc(max_table_length *
sizeof(ub4));
+ bind->array.elements = (ub4 *)safe_emalloc(max_table_length,
sizeof(ub4), 0);
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++) {
@@ -1473,11 +1478,12 @@
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
- bind->array.elements = (double *)emalloc(max_table_length *
sizeof(double));
+ bind->array.elements = (double
*)safe_emalloc(max_table_length, sizeof(double), 0);
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++) {
@@ -1509,11 +1515,12 @@
hash = HASH_OF(var);
bind = emalloc(sizeof(php_oci_bind));
- bind->array.elements = (OCIDate *)emalloc(max_table_length *
sizeof(OCIDate));
+ bind->array.elements = (OCIDate
*)safe_emalloc(max_table_length, sizeof(OCIDate), 0);
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
