From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 22 Sep 2009 01:02:21 +0000 (+0200)
Subject: sed: fix bug 623 (SEGV on some sed commands)
X-Git-Tag: 1_16_0~471
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11c8238d1b0f72dffb2be563069ba5acca075f8e;p=oweals%2Fbusybox.git

sed: fix bug 623 (SEGV on some sed commands)

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

diff --git a/editors/sed.c b/editors/sed.c
index b74941944..e7b2c214a 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -690,10 +690,8 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
 		if (sed_cmd->which_match)
 			break;
 
-		if (*line == '\0')
-			break;
 //maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL?
-	} while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
+	} while (*line && regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
 
 	/* Copy rest of string into output pipeline */
 	while (1) {