archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MFH: use safe_emalloc()

Browse source
This commit is contained in:
Antony Dovgal 2007-07-10 11:08:08 +00:00
parent b0ef04af84
commit d0ee4977e7
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/bcmath/libbcmath/src/div.c
View file

@ -127,13 +127,13 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
extra = scale - scale1; extra = scale - scale1;
else else
extra = 0; extra = 0;
num1 = (unsigned char *) emalloc (n1->n_len+n1->n_scale+extra+2); num1 = (unsigned char *) safe_emalloc (1, n1->n_len+n1->n_scale, extra+2);
if (num1 == NULL) bc_out_of_memory(); if (num1 == NULL) bc_out_of_memory();
memset (num1, 0, n1->n_len+n1->n_scale+extra+2); memset (num1, 0, n1->n_len+n1->n_scale+extra+2);
memcpy (num1+1, n1->n_value, n1->n_len+n1->n_scale); memcpy (num1+1, n1->n_value, n1->n_len+n1->n_scale);
len2 = n2->n_len + scale2; len2 = n2->n_len + scale2;
num2 = (unsigned char *) emalloc (len2+1); num2 = (unsigned char *) safe_emalloc (1, len2, 1);
if (num2 == NULL) bc_out_of_memory(); if (num2 == NULL) bc_out_of_memory();
memcpy (num2, n2->n_value, len2); memcpy (num2, n2->n_value, len2);
*(num2+len2) = 0; *(num2+len2) = 0;
@ -164,7 +164,7 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
memset (qval->n_value, 0, qdigits); memset (qval->n_value, 0, qdigits);
/* Allocate storage for the temporary storage mval. */ /* Allocate storage for the temporary storage mval. */
mval = (unsigned char *) emalloc (len2+1); mval = (unsigned char *) safe_emalloc (1, len2, 1);
if (mval == NULL) bc_out_of_memory (); if (mval == NULL) bc_out_of_memory ();
/* Now for the full divide algorithm. */ /* Now for the full divide algorithm. */

4
ext/bcmath/libbcmath/src/init.c
View file

@ -51,7 +51,7 @@ _bc_new_num_ex (length, scale, persistent)
bc_num temp; bc_num temp;
/* PHP Change: malloc() -> pemalloc(), removed free_list code */ /* PHP Change: malloc() -> pemalloc(), removed free_list code */
temp = (bc_num) pemalloc (sizeof(bc_struct)+length+scale, persistent); temp = (bc_num) safe_pemalloc (1, sizeof(bc_struct)+length, scale, persistent);
#if 0 #if 0
if (_bc_Free_list != NULL) { if (_bc_Free_list != NULL) {
temp = _bc_Free_list; temp = _bc_Free_list;
@ -66,7 +66,7 @@ _bc_new_num_ex (length, scale, persistent)
temp->n_scale = scale; temp->n_scale = scale;
temp->n_refs = 1; temp->n_refs = 1;
/* PHP Change: malloc() -> pemalloc() */ /* PHP Change: malloc() -> pemalloc() */
temp->n_ptr = (char *) pemalloc (length+scale, persistent); temp->n_ptr = (char *) safe_pemalloc (1, length, scale, persistent);
if (temp->n_ptr == NULL) bc_out_of_memory(); if (temp->n_ptr == NULL) bc_out_of_memory();
temp->n_value = temp->n_ptr; temp->n_value = temp->n_ptr;
memset (temp->n_ptr, 0, length+scale); memset (temp->n_ptr, 0, length+scale);

4
ext/bcmath/libbcmath/src/num2str.c
View file

@ -51,9 +51,9 @@ char
/* Allocate the string memory. */ /* Allocate the string memory. */
signch = ( num->n_sign == PLUS ? 0 : 1 ); /* Number of sign chars. */ signch = ( num->n_sign == PLUS ? 0 : 1 ); /* Number of sign chars. */
if (num->n_scale > 0) if (num->n_scale > 0)
str = (char *) emalloc (num->n_len + num->n_scale + 2 + signch); str = (char *) safe_emalloc (1, num->n_len + num->n_scale, 2 + signch);
else else
str = (char *) emalloc (num->n_len + 1 + signch); str = (char *) safe_emalloc (1, num->n_len, 1 + signch);
if (str == NULL) bc_out_of_memory(); if (str == NULL) bc_out_of_memory();
/* The negative sign if needed. */ /* The negative sign if needed. */