]> granicus.if.org Git - php/commitdiff
use safe_realloc
authorStanislav Malyshev <stas@php.net>
Tue, 6 Mar 2007 02:10:25 +0000 (02:10 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 6 Mar 2007 02:10:25 +0000 (02:10 +0000)
ext/bz2/bz2.c
ext/sybase_ct/php_sybase_ct.c

index ce17adf6fec0dc775d1d7a62e8c7279a822c4e16..ebe0eb5f37d4a54bcad1b0764fe0c45de055aab8 100644 (file)
@@ -562,13 +562,13 @@ static PHP_FUNCTION(bzdecompress)
                /* compression is better then 2:1, need to allocate more memory */
                bzs.avail_out = source_len;
                size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
-               dest = erealloc(dest, size + bzs.avail_out + 1);
+               dest = safe_erealloc(dest, 1, bzs.avail_out+1, size );
                bzs.next_out = dest + size;
        }
 
        if (error == BZ_STREAM_END || error == BZ_OK) {
                size = (bzs.total_out_hi32 * (unsigned int) -1) + bzs.total_out_lo32;
-               dest = erealloc(dest, size + 1);
+               dest = safe_erealloc(dest, 1, size, 1);
                dest[size] = '\0';
                RETVAL_STRINGL(dest, size, 0);
        } else { /* real error */
index 10358c96c40075069d4be3411e71eb566da5adcb..581f4f44fa21ce2c59dedfd229deb40761ed7c89 100644 (file)
@@ -1138,7 +1138,7 @@ static int php_sybase_fetch_result_row (sybase_result *result, int numrows)
                result->num_rows++;
                i= result->store ? result->num_rows- 1 : 0;
                if (i >= result->blocks_initialized*SYBASE_ROWS_BLOCK) {
-                       result->data = (zval **) erealloc(result->data, sizeof(zval *)*SYBASE_ROWS_BLOCK*(++result->blocks_initialized));
+                       result->data = (zval **) safe_erealloc(result->data, SYBASE_ROWS_BLOCK*(++result->blocks_initialized), sizeof(zval *), 0);
                }
                if (result->store || 1 == result->num_rows) {
                        result->data[i] = (zval *) safe_emalloc(sizeof(zval), result->num_fields, 0);