use safe_emalloc()

diff --git a/ext/bcmath/libbcmath/src/div.c b/ext/bcmath/libbcmath/src/div.c
index 1ad3710128f2d4a3b534bb6e516c1dd3e61107d4..8c05170c7ee63493b897096041b20445c10a524e 100644 (file)
--- a/ext/bcmath/libbcmath/src/div.c
+++ b/ext/bcmath/libbcmath/src/div.c
@@ -127,13 +127,13 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
     extra = scale - scale1;
   else
     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();
   memset (num1, 0, n1->n_len+n1->n_scale+extra+2);
   memcpy (num1+1, n1->n_value, n1->n_len+n1->n_scale);
 
   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();
   memcpy (num2, n2->n_value, len2);
   *(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);
 
   /* 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 ();
 
   /* Now for the full divide algorithm. */

diff --git a/ext/bcmath/libbcmath/src/init.c b/ext/bcmath/libbcmath/src/init.c
index cd45b9fbc1862537012a375fb6eb442aac51ba0b..986ad1df2416abc70ed90023c5c26c492f8f03db 100644 (file)
--- a/ext/bcmath/libbcmath/src/init.c
+++ b/ext/bcmath/libbcmath/src/init.c
@@ -51,7 +51,7 @@ _bc_new_num_ex (length, scale, persistent)
   bc_num temp;
 
   /* 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 (_bc_Free_list != NULL) {
     temp = _bc_Free_list;
@@ -66,7 +66,7 @@ _bc_new_num_ex (length, scale, persistent)
   temp->n_scale = scale;
   temp->n_refs = 1;
   /* 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();
   temp->n_value = temp->n_ptr;
   memset (temp->n_ptr, 0, length+scale);

diff --git a/ext/bcmath/libbcmath/src/num2str.c b/ext/bcmath/libbcmath/src/num2str.c
index c47ec9bbad5c1a5ae93f4c16a1252c5334dc1905..14c57726fe6d8515e1a2dd44a6222ff4fd4ade19 100644 (file)
--- a/ext/bcmath/libbcmath/src/num2str.c
+++ b/ext/bcmath/libbcmath/src/num2str.c
@@ -51,9 +51,9 @@ char
   /* Allocate the string memory. */
   signch = ( num->n_sign == PLUS ? 0 : 1 );  /* Number of sign chars. */
   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
-    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();
 
   /* The negative sign if needed. */