aboutsummaryrefslogtreecommitdiffstats
path: root/params.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2003-12-06 21:07:27 +0000
committerWayne Davison <wayned@samba.org>2003-12-06 21:07:27 +0000
commit58cadc8608fbb2cbc7b74578cd92de4337a4b887 (patch)
tree2a6d671629752eb4f319556b8d8438d535b8cd44 /params.c
parentb11b50bcd026a0a052bdfab7b96c97045b658d86 (diff)
downloadandroid_external_rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.tar.gz
android_external_rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.tar.bz2
android_external_rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.zip
Merged in the security fixes from 2.5.7.
Diffstat (limited to 'params.c')
-rw-r--r--params.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/params.c b/params.c
index 81638118..56a2a914 100644
--- a/params.c
+++ b/params.c
@@ -207,7 +207,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
if( i > (bSize - 2) )
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func);
@@ -301,7 +301,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if( i > (bSize - 2) ) /* Ensure there's space for next char. */
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
@@ -366,7 +366,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if( i > (bSize - 2) ) /* Make sure there's enough room. */
{
bSize += BUFR_INC;
- bufr = Realloc( bufr, bSize );
+ bufr = realloc_array( bufr, char, bSize );
if( NULL == bufr )
{
rprintf(FERROR, "%s Memory re-allocation failure.", func) ;
@@ -530,7 +530,7 @@ BOOL pm_process( char *FileName,
else /* If we don't have a buffer */
{ /* allocate one, then parse, */
bSize = BUFR_INC; /* then free. */
- bufr = (char *)malloc( bSize );
+ bufr = new_array( char, bSize );
if( NULL == bufr )
{
rprintf(FERROR,"%s memory allocation failure.\n", func);