d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in sed(1)'s "s" command wherein if an escape ("\" character)

Browse Source 
was initiated at the last character of the line buffer, the Wrong
Thing was done and sed barfed by interpreting the following NUL byte
as a digit.  Instead, pull up the next buffer and record that the "\"
was last seen.
This commit is contained in:
Brian Feldman 2002-06-01 13:25:47 +00:00
parent c83fca1f1f
commit f020c7fa88
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97703
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.bin/sed/compile.c
View File

@ -467,7 +467,7 @@ compile_subst(p, s)
int asize, size;
u_char ref;
char c, *text, *op, *sp;
int more = 1;
int more = 1, sawesc = 0;
c = *p++; /* Terminator character */
if (c == '\0')
@ -482,9 +482,29 @@ compile_subst(p, s)
do {
op = sp = text + size;
for (; *p; p++) {
if (*p == '\\') {
p++;
if (strchr("123456789", *p) != NULL) {
if (*p == '\\' || sawesc) {
/*
* If this is a continuation from the last
* buffer, we won't have a character to
* skip over.
*/
if (sawesc)
sawesc = 0;
else
p++;
if (*p == '\0') {
/*
* This escaped character is continued
* in the next part of the line. Note
* this fact, then cause the loop to
* exit w/ normal EOL case and reenter
* above with the new buffer.
*/
sawesc = 1;
p--;
continue;
} else if (strchr("123456789", *p) != NULL) {
*sp++ = '\\';
ref = *p - '0';
if (s->re != NULL &&