Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a size check in the new code.
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
bb77cfb
..
835c478
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-68,7
+68,7
@@
static int simple_recv_token(int f,char **data)
int n;
if (!buf) {
int n;
if (!buf) {
- buf =
(char *)malloc(
CHUNK_SIZE);
+ buf =
new_array(char,
CHUNK_SIZE);
if (!buf) out_of_memory("simple_recv_token");
}
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);
}
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
out_of_memory("send_deflated_token");
init_done = 1;
} else
@@
-211,7
+211,7
@@
send_deflated_token(int f, int token,
write_byte(f, n >> 8);
if (write_batch) {
write_batch_delta_file((char *)&n,sizeof(char));
write_byte(f, n >> 8);
if (write_batch) {
write_batch_delta_file((char *)&n,sizeof(char));
- temp_byte = (char)
n >> 8
;
+ temp_byte = (char)
(n >> 8)
;
write_batch_delta_file(&temp_byte,sizeof(temp_byte));
}
}
write_batch_delta_file(&temp_byte,sizeof(temp_byte));
}
}
@@
-336,8
+336,8
@@
recv_deflated_token(int f, char **data)
rprintf(FERROR, "inflate init failed\n");
exit_cleanup(RERR_STREAMIO);
}
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 {
out_of_memory("recv_deflated_token");
init_done = 1;
} else {