3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4edb164c..104eacd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* builtin.c (do_sub): Init textlen to zero to avoid "may be
+	used unitialized" warning. Thanks to Corinna Vinschen for
+	pointing this out.
+	* eval.c (unwind_stack): Add parentheses around condition in while
+	to avoid overzealous warning from GCC.
+
 2011-09-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* io.c (remap_std_file): Fix non-portable code that caused
diff --git a/builtin.c b/builtin.c
index 53800fc2..072fd8ff 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2422,7 +2422,7 @@ do_sub(int nargs, unsigned int flags)
 	size_t len;
 	char *matchstart;
 	char *text;
-	size_t textlen;
+	size_t textlen = 0;
 	char *repl;
 	char *replend;
 	size_t repllen;
diff --git a/eval.c b/eval.c
index df9570e3..cd5a5844 100644
--- a/eval.c
+++ b/eval.c
@@ -1418,7 +1418,7 @@ unwind_stack(long n)
 	if (stack_ptr < sp)
 		return NULL;
 
-	while (r = POP()) {
+	while ((r = POP()) != NULL) {
 		switch (r->type) {
 		case Node_frame:
 			cp = restore_frame(r);