sniper Thu Aug 28 12:28:28 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
MFH: some emalloc() -> safe_emalloc() fixes
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.5
php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.6
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.5 Thu Aug 28 12:16:59 2003
+++ php-src/ext/sybase_ct/php_sybase_ct.c Thu Aug 28 12:28:27 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.73.2.5 2003/08/28 16:16:59 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.73.2.6 2003/08/28 16:28:27 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1043,7 +1043,7 @@
result->data = (zval **) erealloc(result->data, sizeof(zval
*)*SYBASE_ROWS_BLOCK*(++result->blocks_initialized));
}
if (result->store || 1 == result->num_rows) {
- result->data[i] = (zval *)
emalloc(sizeof(zval)*result->num_fields);
+ result->data[i] = (zval *) safe_emalloc(sizeof(zval),
result->num_fields, 0);
}
for (j=0; j<result->num_fields; j++) {
@@ -1104,7 +1104,7 @@
}
result = (sybase_result *) emalloc(sizeof(sybase_result));
- result->data = (zval **) emalloc(sizeof(zval *)*SYBASE_ROWS_BLOCK);
+ result->data = (zval **) safe_emalloc(sizeof(zval *), SYBASE_ROWS_BLOCK, 0);
result->fields = NULL;
result->sybase_ptr = sybase_ptr;
result->cur_field=result->cur_row=result->num_rows=0;
@@ -1112,12 +1112,12 @@
result->last_retcode = 0;
result->store= store;
result->blocks_initialized= 1;
- result->tmp_buffer = (char **) emalloc(sizeof(char *)*num_fields);
- result->lengths = (CS_INT *) emalloc(sizeof(CS_INT)*num_fields);
- result->indicators = (CS_SMALLINT *) emalloc(sizeof(CS_INT)*num_fields);
- result->datafmt = (CS_DATAFMT *) emalloc(sizeof(CS_DATAFMT)*num_fields);
- result->numerics = (unsigned char *) emalloc(sizeof(unsigned char)*num_fields);
- result->types = (CS_INT *) emalloc(sizeof(CS_INT)*num_fields);
+ result->tmp_buffer = (char **) safe_emalloc(sizeof(char *), num_fields, 0);
+ result->lengths = (CS_INT *) safe_emalloc(sizeof(CS_INT), num_fields, 0);
+ result->indicators = (CS_SMALLINT *) safe_emalloc(sizeof(CS_INT), num_fields,
0);
+ result->datafmt = (CS_DATAFMT *) safe_emalloc(sizeof(CS_DATAFMT), num_fields,
0);
+ result->numerics = (unsigned char *) safe_emalloc(sizeof(unsigned char),
num_fields, 0);
+ result->types = (CS_INT *) safe_emalloc(sizeof(CS_INT), num_fields, 0);
for (i=0; i<num_fields; i++) {
ct_describe(sybase_ptr->cmd, i+1, &result->datafmt[i]);
@@ -1181,7 +1181,7 @@
ct_bind(sybase_ptr->cmd, i+1, &result->datafmt[i],
result->tmp_buffer[i], &result->lengths[i], &result->indicators[i]);
}
- result->fields = (sybase_field *) emalloc(sizeof(sybase_field)*num_fields);
+ result->fields = (sybase_field *) safe_emalloc(sizeof(sybase_field),
num_fields, 0);
j=0;
for (i=0; i<num_fields; i++) {
char computed_buf[16];
@@ -1334,7 +1334,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cannot
read results");
RETURN_FALSE;
}
-
+
switch ((int) restype) {
case CS_CMD_FAIL:
default:
@@ -1478,7 +1478,7 @@
}
/* Indicate we have data in case of buffered queries */
- id= ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+ id = ZEND_REGISTER_RESOURCE(return_value, result, le_result);
sybase_ptr->active_result_index= buffered ? id : 0;
}
@@ -2057,7 +2057,7 @@
WRONG_PARAM_COUNT;
}
- params = emalloc(sizeof(zval **) * argc);
+ params = safe_emalloc(sizeof(zval **), argc, 0);
if (zend_get_parameters_array_ex(argc, params) == FAILURE) {
efree(params);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
