X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b11b50bcd026a0a052bdfab7b96c97045b658d86..58cadc8608fbb2cbc7b74578cd92de4337a4b887:/token.c diff --git a/token.c b/token.c index 8f498f1f..835c4785 100644 --- a/token.c +++ b/token.c @@ -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 {