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

Bug fix: a numeric flag specification in the substitute command would

Browse Source 
cause the next substitute flag to be ignored.
While working at it, detect and report overflows.

Reported by:	Jingsong Liu
MFC after:	1 week
This commit is contained in:
Diomidis Spinellis 2005-08-04 10:05:12 +00:00
parent 8be9063ea1
commit d432588e78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=148692
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,6 +547,7 @@ static char *
compile_flags(char *p, struct s_subst *s)
{
int gn; /* True if we have seen g or n */
unsigned long nval;
char wfile[_POSIX2_LINE_MAX + 1], *q;
s->n = 1; /* Default */
@ -577,8 +578,13 @@ compile_flags(char *p, struct s_subst *s)
errx(1,
"%lu: %s: more than one number or 'g' in substitute flags", linenum, fname);
gn = 1;
/* XXX Check for overflow */
s->n = (int)strtol(p, &p, 10);
errno = 0;
nval = strtol(p, &p, 10);
if (errno == ERANGE || nval > INT_MAX)
errx(1,
"%lu: %s: overflow in the 'N' substitute flag", linenum, fname);
s->n = nval;
p--;
break;
case 'w':
p++;