X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b5bd5542eb99f97561848113887d100b83e9bc43..af1a3f9b6ec7e1a783c00529a109307d9102e589:/util.c

diff --git a/util.c b/util.c
index f2158a02..e7be7d7c 100644
--- a/util.c
+++ b/util.c
@@ -495,12 +495,20 @@ static int exclude_server_path(char *arg)
 	return 0;
 }
 
-static void glob_expand_one(char *s, char **argv, int *argc_ptr, int maxargs)
+static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
+			    int *maxargs_ptr)
 {
+	char **argv = *argv_ptr;
 	int argc = *argc_ptr;
+	int maxargs = *maxargs_ptr;
 #if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
-	if (maxargs <= argc)
-		return;
+	if (argc == maxargs) {
+		maxargs += MAX_ARGS;
+		if (!(argv = realloc_array(argv, char *, maxargs)))
+			out_of_memory("glob_expand_one");
+		*argv_ptr = argv;
+		*maxargs_ptr = maxargs;
+	}
 	if (!*s)
 		s = ".";
 	s = argv[argc++] = strdup(s);
@@ -521,12 +529,17 @@ static void glob_expand_one(char *s, char **argv, int *argc_ptr, int maxargs)
 	memset(&globbuf, 0, sizeof globbuf);
 	if (!exclude_server_path(s))
 		glob(s, 0, NULL, &globbuf);
+	if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) {
+		maxargs += globbuf.gl_pathc + MAX_ARGS;
+		if (!(argv = realloc_array(argv, char *, maxargs)))
+			out_of_memory("glob_expand_one");
+		*argv_ptr = argv;
+		*maxargs_ptr = maxargs;
+	}
 	if (globbuf.gl_pathc == 0)
 		argv[argc++] = s;
 	else {
 		int j = globbuf.gl_pathc;
-		if (j > maxargs - argc)
-			j = maxargs - argc;
 		free(s);
 		for (i = 0; i < j; i++) {
 			if (!(argv[argc++] = strdup(globbuf.gl_pathv[i])))
@@ -539,9 +552,9 @@ static void glob_expand_one(char *s, char **argv, int *argc_ptr, int maxargs)
 }
 
 /* This routine is only used in daemon mode. */
-void glob_expand(char *base1, char **argv, int *argc_ptr, int maxargs)
+void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr)
 {
-	char *s = argv[*argc_ptr];
+	char *s = (*argv_ptr)[*argc_ptr];
 	char *p, *q;
 	char *base = base1;
 	int base_len = strlen(base);
@@ -562,7 +575,7 @@ void glob_expand(char *base1, char **argv, int *argc_ptr, int maxargs)
 	for (q = s; *q; q = p + base_len) {
 		if ((p = strstr(q, base)) != NULL)
 			*p = '\0'; /* split it at this point */
-		glob_expand_one(q, argv, argc_ptr, maxargs);
+		glob_expand_one(q, argv_ptr, argc_ptr, maxargs_ptr);
 		if (!p)
 			break;
 	}
@@ -887,6 +900,27 @@ int pop_dir(char *dir)
 	return 1;
 }
 
+/**
+ * Return the filename, turning any newlines into '?'s.  This ensures that
+ * outputting it on a line of its own cannot generate an empty line.
+ **/
+const char *safe_fname(const char *fname)
+{
+	static char fbuf[MAXPATHLEN];
+	char *nl = strchr(fname, '\n');
+
+	if (!nl)
+		return fname;
+
+	strlcpy(fbuf, fname, sizeof fbuf);
+	nl = fbuf + (nl - (char *)fname);
+	do {
+		*nl = '?';
+	} while ((nl = strchr(nl+1, '\n')) != NULL);
+
+	return fbuf;
+}
+
 /**
  * Return a quoted string with the full pathname of the indicated filename.
  * The string " (in MODNAME)" may also be appended.  The returned pointer
@@ -901,6 +935,7 @@ char *full_fname(const char *fn)
 	if (result)
 		free(result);
 
+	fn = safe_fname(fn);
 	if (*fn == '/')
 		p1 = p2 = "";
 	else {