Merged in the security fixes from 2.5.7.

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index e4b61b8..d8a7af1 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -41,7 +41,7 @@ static struct idlist *gidlist;
 
 static struct idlist *add_list(int id, char *name)
 {
-       struct idlist *list = (struct idlist *)malloc(sizeof(list[0]));
+       struct idlist *list = new(struct idlist);
        if (!list) out_of_memory("add_list");
        list->next = NULL;
        list->name = strdup(name);
@@ -126,7 +126,7 @@ static gid_t match_gid(gid_t gid)
        if (am_root)
                last_out = gid;
        else
-               last_out = -1;
+               last_out = (gid_t) -1;
        return last_out;
 }
 
@@ -241,7 +241,7 @@ void recv_uid_list(int f, struct file_list *flist)
                id = read_int(f);
                while (id != 0) {
                        int len = read_byte(f);
-                       name = (char *)malloc(len+1);
+                       name = new_array(char, len+1);
                        if (!name) out_of_memory("recv_uid_list");
                        read_sbuf(f, name, len);
                        if (!list) {
@@ -264,7 +264,7 @@ void recv_uid_list(int f, struct file_list *flist)
                id = read_int(f);
                while (id != 0) {
                        int len = read_byte(f);
-                       name = (char *)malloc(len+1);
+                       name = new_array(char, len+1);
                        if (!name) out_of_memory("recv_uid_list");
                        read_sbuf(f, name, len);
                        if (!list) {