From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 18 May 2009 21:50:03 +0000 (+0200)
Subject: awk: put at least one NUL between $n. Hopefully closes 337.
X-Git-Tag: 1_15_0~231
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e424423a7b164e0c343c180a944844fd27ccbe97;p=oweals%2Fbusybox.git

awk: put at least one NUL between $n. Hopefully closes 337.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/editors/awk.c b/editors/awk.c
index 924cfcfab..cef73342c 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -1571,13 +1571,14 @@ static int awk_split(const char *s, node *spl, char **slist)
 				n++; /* we saw yet another delimiter */
 			} else {
 				pmatch[0].rm_eo = l;
-				if (s[l]) pmatch[0].rm_eo++;
+				if (s[l])
+					pmatch[0].rm_eo++;
 			}
 			memcpy(s1, s, l);
 			/* make sure we remove *all* of the separator chars */
-			while (l < pmatch[0].rm_eo) {
-				s1[l++] = '\0';
-			}
+			do {
+				s1[l] = '\0';
+			} while (++l < pmatch[0].rm_eo);
 			nextword(&s1);
 			s += pmatch[0].rm_eo;
 		} while (*s);