Die if we overflowed the args[] array when building up the remote

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 22f688d..f21adb7 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -36,6 +36,7 @@ extern int am_server;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
+extern int numeric_ids;
 
 extern int cvs_exclude;
 
@@ -73,14 +74,15 @@ static char empty_sum[MD4_SUM_LENGTH];
 static unsigned int min_file_struct_len;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
 
 
 void init_flist(void)
 {
-    struct file_struct f;
+       struct file_struct f;
 
-    /* Figure out how big the file_struct is without trailing padding */
-    min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
+       /* Figure out how big the file_struct is without trailing padding */
+       min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
 }
 
 
@@ -277,37 +279,45 @@ static int flist_dir_len;
  * Make sure @p flist is big enough to hold at least @p flist->count
  * entries.
  **/
-static void flist_expand(struct file_list *flist)
+void flist_expand(struct file_list *flist)
 {
-       if (flist->count >= flist->malloced) {
-               void *new_ptr;
+       void *new_ptr;
 
-               if (flist->malloced < 1000)
-                       flist->malloced += 1000;
-               else
-                       flist->malloced *= 2;
+       if (flist->count < flist->malloced)
+               return;
 
-               if (flist->files) {
-                       new_ptr = realloc_array(flist->files,
-                                               struct file_struct *,
-                                               flist->malloced);
-               } else {
-                       new_ptr = new_array(struct file_struct *,
-                                           flist->malloced);
-               }
+       if (flist->malloced < FLIST_START)
+               flist->malloced = FLIST_START;
+       else if (flist->malloced >= FLIST_LINEAR)
+               flist->malloced += FLIST_LINEAR;
+       else
+               flist->malloced *= 2;
+
+       /*
+        * In case count jumped or we are starting the list
+        * with a known size just set it.
+        */
+       if (flist->malloced < flist->count)
+               flist->malloced = flist->count;
+
+       if (flist->files) {
+               new_ptr = realloc_array(flist->files,
+                   struct file_struct *, flist->malloced);
+       } else {
+               new_ptr = new_array(struct file_struct *, flist->malloced);
+       }
 
-               if (verbose >= 2) {
-                       rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
-                           who_am_i(),
-                           (double) sizeof flist->files[0] * flist->malloced,
-                           (new_ptr == flist->files) ? " not" : "");
-               }
+       if (verbose >= 2) {
+               rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+                   who_am_i(),
+                   (double) sizeof flist->files[0] * flist->malloced,
+                   (new_ptr == flist->files) ? " not" : "");
+       }
 
-               flist->files = (struct file_struct **) new_ptr;
+       flist->files = (struct file_struct **) new_ptr;
 
-               if (!flist->files)
-                       out_of_memory("flist_expand");
-       }
+       if (!flist->files)
+               out_of_memory("flist_expand");
 }
 
 void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
@@ -434,11 +444,13 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-               add_uid(uid);
+               if (!numeric_ids)
+                       add_uid(uid);
                write_int(f, uid);
        }
        if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-               add_gid(gid);
+               if (!numeric_ids)
+                       add_gid(gid);
                write_int(f, gid);
        }
        if (preserve_devices && IS_DEVICE(mode)) {
@@ -1190,6 +1202,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        write_batch_flist_info(flist->count, flist->files);
        }
 
+       if (verbose > 3)
+               output_flist(flist);
+
        if (verbose > 2)
                rprintf(FINFO, "send_file_list done\n");
 
@@ -1265,6 +1280,9 @@ struct file_list *recv_file_list(int f)
                }
        }
 
+       if (verbose > 3)
+               output_flist(flist);
+
        if (list_only) {
                int i;
                for (i = 0; i < flist->count; i++)
@@ -1429,18 +1447,21 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                        }
                }
        }
+}
 
-       if (verbose <= 3)
-               return;
+static void output_flist(struct file_list *flist)
+{
+       char uidbuf[16], gidbuf[16];
+       struct file_struct *file;
+       int i;
 
        for (i = 0; i < flist->count; i++) {
-               char uidbuf[16], gidbuf[16];
-               struct file_struct *file = flist->files[i];
+               file = flist->files[i];
                if (am_root && preserve_uid)
                        sprintf(uidbuf, " uid=%ld", (long)file->uid);
                else
                        *uidbuf = '\0';
-               if (preserve_gid)
+               if (preserve_gid && file->gid != GID_NONE)
                        sprintf(gidbuf, " gid=%ld", (long)file->gid);
                else
                        *gidbuf = '\0';