diff options
author | Wayne Davison <wayned@samba.org> | 2003-12-06 21:07:27 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2003-12-06 21:07:27 +0000 |
commit | 58cadc8608fbb2cbc7b74578cd92de4337a4b887 (patch) | |
tree | 2a6d671629752eb4f319556b8d8438d535b8cd44 /params.c | |
parent | b11b50bcd026a0a052bdfab7b96c97045b658d86 (diff) | |
download | android_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.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); |