Merge branch 'gawk-4.1-stable'

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 414efea5..afff64f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-03         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* profile.c (pp_list): Unconditionally compute delimlen. Avoids
+	compiler warning.
+
 2016-03-02         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* debug.c (print_instruction): Improvements in instruction dump
diff --git a/profile.c b/profile.c
index 9e4a9b02..43875600 100644
--- a/profile.c
+++ b/profile.c
@@ -1538,10 +1538,10 @@ pp_list(int nargs, const char *paren, const char *delim)
 		erealloc(pp_args, NODE **, (nargs + 2) * sizeof(NODE *), "pp_list");
 	}
 
+	delimlen = strlen(delim);
 	if (nargs == 0)
 		len = 2;
 	else {
-		delimlen = strlen(delim);
 		len = -delimlen;
 		for (i = 1; i <= nargs; i++) {
 			r = pp_args[i] = pp_pop();