From nobody Mon Apr 17 20:22:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0dkd0KRwz458HX; Mon, 17 Apr 2023 20:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0dkc71l6z4DtH; Mon, 17 Apr 2023 20:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681762921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPzoXLSPOhVM1j5AQQsR+BQZgkJtoTWL3KdOshROf0w=; b=VKQg9loiXGEHkXdhM4uZ+dVx1/Ynvlbf5b+olW/4wZhIivMtAq34fwLyJaIp+CKU4SRAjV tJHmB3kNw33TQRy8RRdY68C9htcVCiem1kFFUhGzHL5nmVMywmA+BbsgqKsICqmk+ZofTE ghHx25Yxxzamhaf7GWuD1yNsIpX4tfdpwW1T7ogY/NQau0sRPNoREeNk6fJKdpweA8iKNi yYb9yBajd7Uy74puYQ489TzQ5EirFoKATvpmq1/1WtP60hz4mHXpofn38t9tXHcytANoBX PfJJZguFr/NDtL7CRyG6Rj507wKXPyP35Rc1rEMkOgix0yeSD1CHDSNV3/pxNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681762921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPzoXLSPOhVM1j5AQQsR+BQZgkJtoTWL3KdOshROf0w=; b=r3VjDNUbPtpap2okFzLq2LH5N78LpRWdNBVGI4O61iFEp0uMsDBgUDMFAqMtpJQRgOkzdE /PRL2+Ao//Ms1vfSY1SP4vtibgNuD+ogptUucMtLqlsBf4Y90rtkTtpcyut4aG3VwJQztq quMvlyYODTX7HGtXRWsCaFk3yt2QYGXhQZWpzIcLUv4VOPBVrFbw3FqaUtw5VPFHJ7XD4B 86O25uRQoIl9vIGKMlrxb4PSe/nth1NaJqQ9LKzYkV7nj6hBdL8ZYl9MT9SHrK8FuR4U2D QxeN/3OmFGxrm2PGbaockQOdqdeZONpZE2qsYugJRcpZgYIQTvd+86kaxNNRSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681762921; a=rsa-sha256; cv=none; b=DaxU8jT2J8kQpkShHxwu7BoPxxkegjmJqkbKAR/I1jDCD75UndRZIZ/FqfPVuaMy5I8Z2j /KdDQ3PFdpQ8YMr3bcDknXgX/FRpxIzD1H2mlDebRoUn3dnBV6ztWf+uLaflb0KTI5CRzl Tip9+mZBpxus7nyQedeF1d4MnzvXLCySJAzHwS0SSWoHbTjAP8JwJZ1fRN9948vH4opvnZ kfVbnNanAPIYXPFdSQ29NvDbHI+teJMAEm62tpRzsx2MqmBXIjfX5KJff2oZXp2Q1bw1lb JBR0fa9w6H2hrhqiQQcKdnocYDV6jezlYTkNtaaqohPlDPVdP8nG4zMU4ZmaRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0dkc62xtzjKK; Mon, 17 Apr 2023 20:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HKM0fR030579; Mon, 17 Apr 2023 20:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HKM0vg030578; Mon, 17 Apr 2023 20:22:00 GMT (envelope-from git) Date: Mon, 17 Apr 2023 20:22:00 GMT Message-Id: <202304172022.33HKM0vg030578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 21ef48af5c0f - main - xargs: improve foundeof check for -E List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21ef48af5c0f4ed85a5f42855b5a8d58b5431103 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=21ef48af5c0f4ed85a5f42855b5a8d58b5431103 commit 21ef48af5c0f4ed85a5f42855b5a8d58b5431103 Author: Yuri Pankov AuthorDate: 2023-04-17 19:14:33 +0000 Commit: Yuri Pankov CommitDate: 2023-04-17 20:20:03 +0000 xargs: improve foundeof check for -E 4aeb63826e0f 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 --- usr.bin/xargs/xargs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 21455e7be26e..cadb0c76cc2f 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -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) {