summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/utils.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ca3eb3ccd..34b625a52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-14  Peter Stephenson  <pws@csr.com>
 
+	* 24712: Src/utils.c: handling of backticks when being requoted
+	for use inside double quotes had off-by-one error.
+
 	* 24711: Src/parse.c, Src/text.c, Src/zsh.h,
 	Test/A04redirect.ztst:  fix re-presentation of here-documents
 	munged internally to here-strings.
diff --git a/Src/utils.c b/Src/utils.c
index a5b81420f..1d0b5dc67 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4268,6 +4268,8 @@ quotestring(const char *s, char **e, int instring)
 		while (*u && *u != c)
 		    *v++ = *u++;
 		*v++ = c;
+		if (*u)
+		    u++;
 		continue;
 	    } else if ((*u == Qstring || *u == '$') && u[1] == '\'' &&
 		       instring == QT_DOUBLE) {