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

xargs: improve foundeof check for -E

Browse Source 
4aeb63826e got it almost correct (we can't use strcmp() here as
current argument isn't guaranteed to be NUL-terminated), but we also
need to check that current argument length is equal to that of eofstr.

PR:		270867
Reviewed by:	bapt
Differential Revision:	https://reviews.freebsd.org/D39583
This commit is contained in:
Yuri Pankov 2023-04-17 21:14:33 +02:00
parent b03311cadd
commit 21ef48af5c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/xargs/xargs.c
View File

@ -91,6 +91,7 @@ static char echo[] = _PATH_ECHO;
static char **av, **bxp, **ep, **endxp, **xp;
static char *argp, *bbp, *ebp, *inpline, *p, *replstr;
static const char *eofstr;
static long eoflen;
static int count, insingle, indouble, oflag, pflag, tflag, Rflag, rval, zflag;
static int cnt, Iflag, jfound, Lflag, Sflag, wasquoted, xflag;
static int curprocs, maxprocs;
@ -129,6 +130,7 @@ main(int argc, char *argv[])
inpline = replstr = NULL;
ep = environ;
eofstr = "";
eoflen = 0;
Jflag = nflag = 0;
(void)setlocale(LC_ALL, "");
@ -159,6 +161,7 @@ main(int argc, char *argv[])
switch (ch) {
case 'E':
eofstr = optarg;
eoflen = strlen(eofstr);
break;
case 'I':
Jflag = 0;
@ -348,8 +351,8 @@ arg1: if (insingle || indouble) {
xexit(*av, 1);
}
arg2:
foundeof = *eofstr != '\0' &&
strncmp(argp, eofstr, p - argp) == 0;
foundeof = eoflen != 0 && p - argp == eoflen &&
strncmp(argp, eofstr, eoflen) == 0;
/* Do not make empty args unless they are quoted */
if ((argp != p || wasquoted) && !foundeof) {