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
Merged in the security fixes from 2.5.7.
[rsync/rsync.git]
/
fileio.c
diff --git
a/fileio.c
b/fileio.c
index
088ed63
..
32480f7
100644
(file)
--- a/
fileio.c
+++ b/
fileio.c
@@
-105,7
+105,7
@@
int write_file(int f,char *buf,size_t len)
struct map_struct *map_file(int fd,OFF_T len)
{
struct map_struct *map;
struct map_struct *map_file(int fd,OFF_T len)
{
struct map_struct *map;
- map =
(struct map_struct *)malloc(sizeof(*map)
);
+ map =
new(struct map_struct
);
if (!map) out_of_memory("map_file");
map->fd = fd;
if (!map) out_of_memory("map_file");
map->fd = fd;
@@
-160,7
+160,7
@@
char *map_ptr(struct map_struct *map,OFF_T offset,int len)
/* make sure we have allocated enough memory for the window */
if (window_size > map->p_size) {
/* make sure we have allocated enough memory for the window */
if (window_size > map->p_size) {
- map->p =
(char *)Realloc(map->p
, window_size);
+ map->p =
realloc_array(map->p, char
, window_size);
if (!map->p) out_of_memory("map_ptr");
map->p_size = window_size;
}
if (!map->p) out_of_memory("map_ptr");
map->p_size = window_size;
}