emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sed: fix breakage added by zero length match code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-06-07 16:34:57 +02:00
parent c35545a100
commit 84406e459b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/sed.c
View File

@ -767,7 +767,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
* second is "" before "d", third is "" after "d". * second is "" before "d", third is "" after "d".
* Second match is NOT replaced! * Second match is NOT replaced!
*/ */
if (prev_match_empty || start != 0) { if (prev_match_empty || start != 0 || start != end) {
dbg("inserting replacement at %d in '%s'", start, line); dbg("inserting replacement at %d in '%s'", start, line);
do_subst_w_backrefs(line, sed_cmd->string); do_subst_w_backrefs(line, sed_cmd->string);
} else { } else {

4
testsuite/sed.tests
View File

@ -302,6 +302,10 @@ testing "sed zero chars match/replace advances correctly 2" \
"sed 's [^ .]* x g'" \ "sed 's [^ .]* x g'" \
"x x.x\n" "" " a.b\n" "x x.x\n" "" " a.b\n"
testing "sed zero chars match/replace logic must not falsely trigger here" \
"sed 's/a/A/g'" \
"_AAA1AA\n" "" "_aaa1aa\n"
# testing "description" "commands" "result" "infile" "stdin" # testing "description" "commands" "result" "infile" "stdin"
exit $FAILCOUNT exit $FAILCOUNT