Fixed bug in Gruenbach's code and added test for it

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@405 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

1 files changed, 9 insertions, 7 deletions

diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c
index a5f1c65..6fafde7 100644
--- a/rdiff-backup/rdiff_backup/cmodule.c
+++ b/rdiff-backup/rdiff_backup/cmodule.c
@@ -283,23 +283,25 @@ int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
 
 const char *quote(const char *str)
 {
-	static char *quoted_str;
-	static size_t quoted_str_len;
+	static char *quoted_str = NULL;
+	static size_t quoted_str_len = 0;
 	const unsigned char *s;
 	char *q;
-	size_t nonpr;
+	size_t nonpr, total_len;
 
 	if (!str)
 		return str;
 
-	for (nonpr = 0, s = (unsigned char *)str; *s != '\0'; s++)
-		if (!isprint(*s) || isspace(*s) || *s == '\\' || *s == '=')
-			nonpr++;
+	for (nonpr = 0, s = (unsigned char *)str, total_len = 0;
+		 *s != '\0'; s++, total_len++) {
+	  if (!isprint(*s) || isspace(*s) || *s == '\\' || *s == '=')
+		nonpr++;
+	}
 	if (nonpr == 0)
 		return str;
 
 	if (high_water_alloc((void **)&quoted_str, &quoted_str_len,
-			     nonpr * 3 + 1))
+			     nonpr * 3 + total_len + 1))
 		return NULL;
 	for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) {
 		if (!isprint(*s) || isspace(*s) || *s == '\\' || *s == '=') {