From cd1b5d86e0a6ac37e982c6a3b8725fd11076f14c Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Tue, 1 May 2012 19:43:44 +0000
Subject: users/17046: don't count too many elements when splitting quoted
 parameter substitution on null parameter

---
 Src/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Src/utils.c')

diff --git a/Src/utils.c b/Src/utils.c
index fb65ba815..9603389cc 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -3114,7 +3114,7 @@ wordcount(char *s, char *sep, int mul)
 	r = 1;
 	sl = strlen(sep);
 	for (; (c = findsep(&s, sep, 0)) >= 0; s += sl)
-	    if ((c && *(s + sl)) || mul)
+	    if ((c || mul) && (sl || *(s + sl)))
 		r++;
     } else {
 	char *t = s;
-- 
cgit v1.2.3