summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/builtin.c2
-rw-r--r--Src/utils.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38b790e59..bba59595a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-23  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
+	* 39087: Src/builtin.c, Src/utils.c: fix 'conditionally
+	uninitialized' variables
+
 	* 39086: Src/mem.c: declare file local variables as 'static'
 
 2016-08-22  Oliver Kiddle  <opk@zsh.org>
diff --git a/Src/builtin.c b/Src/builtin.c
index fb14b2e33..da453000c 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1610,7 +1610,7 @@ bin_fc(char *nam, char **argv, Options ops, int func)
 		unqueue_signals();
 		if (fcedit(editor, fil)) {
 		    if (stuff(fil))
-			zwarnnam("fc", "%e: %s", errno, s);
+			zwarnnam("fc", "%e: %s", errno, fil);
 		    else {
 			loop(0,1);
 			retval = lastval;
diff --git a/Src/utils.c b/Src/utils.c
index 45fd19286..d209078f4 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -5082,8 +5082,10 @@ mb_niceformat(const char *s, FILE *stream, char **outstrp, int flags)
 	    cnt = 1;
 	    /* FALL THROUGH */
 	default:
-	    if (c == L'\'' && (flags & NICEFLAG_QUOTE))
+	    if (c == L'\'' && (flags & NICEFLAG_QUOTE)) {
 		fmt = "\\'";
+		newl = 2;
+	    }
 	    else
 		fmt = wcs_nicechar_sel(c, &newl, NULL, flags & NICEFLAG_QUOTE);
 	    break;