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 /token.c | |
| parent | b11b50bcd026a0a052bdfab7b96c97045b658d86 (diff) | |
| download | rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.tar.gz rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.tar.bz2 rsync-58cadc8608fbb2cbc7b74578cd92de4337a4b887.zip | |
Merged in the security fixes from 2.5.7.
Diffstat (limited to 'token.c')
| -rw-r--r-- | token.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -68,7 +68,7 @@ static int simple_recv_token(int f,char **data) int n; if (!buf) { - buf = (char *)malloc(CHUNK_SIZE); + buf = new_array(char, CHUNK_SIZE); if (!buf) out_of_memory("simple_recv_token"); } @@ -174,7 +174,7 @@ send_deflated_token(int f, int token, rprintf(FERROR, "compression init failed\n"); exit_cleanup(RERR_STREAMIO); } - if ((obuf = malloc(OBUF_SIZE)) == NULL) + if ((obuf = new_array(char, OBUF_SIZE)) == NULL) out_of_memory("send_deflated_token"); init_done = 1; } else @@ -336,8 +336,8 @@ recv_deflated_token(int f, char **data) rprintf(FERROR, "inflate init failed\n"); exit_cleanup(RERR_STREAMIO); } - if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL - || (dbuf = malloc(AVAIL_OUT_SIZE(CHUNK_SIZE))) == NULL) + if (!(cbuf = new_array(char, MAX_DATA_COUNT)) + || !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE)))) out_of_memory("recv_deflated_token"); init_done = 1; } else { |