From: Pavel Labath <pavelo@centrum.sk>
Date: Tue, 2 Jun 2009 13:47:30 +0000 (+0200)
Subject: Fix core dumps while handling templates
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=854082132324b51f32f56a16aa68f333a05daae4;p=monky

Fix core dumps while handling templates

Conky would dump core when encountering templates with no parameters (both $templateX and
${templateX}) and when the line contained improperly nested {}.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
---

diff --git a/src/conky.c b/src/conky.c
index 042e02e..ed515f2 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -2954,7 +2954,8 @@ static char *backslash_escape(const char *src, char **templates, unsigned int te
  */
 static char *handle_template(const char *tmpl, const char *args)
 {
-	char *args_dup, *p, *p_old;
+	char *args_dup = NULL;
+	char *p, *p_old;
 	char **argsp = NULL;
 	unsigned int argcnt = 0, template_idx, i;
 	char *eval_text;
@@ -2963,28 +2964,30 @@ static char *handle_template(const char *tmpl, const char *args)
 	    (template_idx > 9))
 		return NULL;
 
-	args_dup = strdup(args);
-	p = args_dup;
-	while (*p) {
-		while (*p && (*p == ' ' && *(p - 1) != '\\'))
-			p++;
-		if (*(p - 1) == '\\')
-			p--;
-		p_old = p;
-		while (*p && (*p != ' ' || *(p - 1) == '\\'))
-			p++;
-		if (*p) {
-			(*p) = '\0';
-			p++;
+	if(args) {
+		args_dup = strdup(args);
+		p = args_dup;
+		while (*p) {
+			while (*p && (*p == ' ' && *(p - 1) != '\\'))
+				p++;
+			if (*(p - 1) == '\\')
+				p--;
+			p_old = p;
+			while (*p && (*p != ' ' || *(p - 1) == '\\'))
+				p++;
+			if (*p) {
+				(*p) = '\0';
+				p++;
+			}
+			argsp = realloc(argsp, ++argcnt * sizeof(char *));
+			argsp[argcnt - 1] = p_old;
+		}
+		for (i = 0; i < argcnt; i++) {
+			char *tmp;
+			tmp = backslash_escape(argsp[i], NULL, 0);
+			DBGP2("%s: substituted arg '%s' to '%s'", tmpl, argsp[i], tmp);
+			argsp[i] = tmp;
 		}
-		argsp = realloc(argsp, ++argcnt * sizeof(char *));
-		argsp[argcnt - 1] = p_old;
-	}
-	for (i = 0; i < argcnt; i++) {
-		char *tmp;
-		tmp = backslash_escape(argsp[i], NULL, 0);
-		DBGP2("%s: substituted arg '%s' to '%s'", tmpl, argsp[i], tmp);
-		argsp[i] = tmp;
 	}
 
 	eval_text = backslash_escape(template[template_idx], argsp, argcnt);
@@ -3019,25 +3022,36 @@ static char *find_and_replace_templates(const char *inbuf)
 		}
 
 		if (*(p + 1) == '{') {
-			templ = p + 2;
-			while (*p != ' ')
+			p += 2;
+			templ = p;
+			while (*p && *p != ' ' && *p != '{' && *p != '}')
 				p++;
-			*(p++) = '\0';
-			args = p;
+			if (*p == '}')
+				args = NULL;
+			else
+				args = p;
+
 			stack = 1;
-			while (stack > 0) {
-				p++;
+			while (*p && stack > 0) {
 				if (*p == '{')
 					stack++;
 				else if (*p == '}')
 					stack--;
+				p++;
+			}
+			if (stack == 0) {
+				// stack is empty. that means the previous char was }, so we zero it
+				*(p - 1) = '\0';
+			} else {
+				// we ran into the end of string without finding a closing }, bark
+				CRIT_ERR("cannot find a closing '}' in template expansion");
 			}
-			*(p++) = '\0';
 		} else {
 			templ = p + 1;
-			while (*p != ' ')
+			while (*p && *p != ' ')
 				p++;
-			*(p++) = '\0';
+			if(*p)
+				*(p++) = '\0';
 			args = NULL;
 		}
 		tmpl_out = handle_template(templ, args);