From nobody Tue Jul 5 15:18:28 2022 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 C6EFC1D0550C; Tue, 5 Jul 2022 15:18:28 +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 4LcmXN568Qz4Sd8; Tue, 5 Jul 2022 15:18:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657034308; 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=DcCi0CvhgnGZc2L8VuIDn/AQPk51qHJIcqY/0ux2Dzw=; b=dor3QI4OMhRFVtqkhEmPBoQ4Rslum2cDJWxKmxHOPfuCDT7vSQAk7PyOXIPURQwzlG5GaM NTk1m9H8zHs+2ra59kYo1yCxXf4DBW4T4UgNWq+7ztJIT6LWB6YuD/qMqo2CvmtAfdc5ih LH7SL0pvXef4Or0mKeQTgN0B1q3QrWbiRtVnErqp/f/Bzf/G2dFFbw60UuBfkZxSAnIh3w kq3ws/ipDQc4AL466J3l1/8Ccbm/+cQxFL6d0xBuHr7DnabAn5/boW9FYBDsOcwY5MiT22 asO5/eHmVBxrF86n0YoB8GYG1Ez6o1IlRlaWe+GSIqW0IAQg00+GF5qk2eJ91g== 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 8F43627E97; Tue, 5 Jul 2022 15:18:28 +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 265FISCQ084049; Tue, 5 Jul 2022 15:18:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265FISUN084048; Tue, 5 Jul 2022 15:18:28 GMT (envelope-from git) Date: Tue, 5 Jul 2022 15:18:28 GMT Message-Id: <202207051518.265FISUN084048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: f058359ba5e0 - main - xargs: terminate if line replacement cannot be constructed 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f058359ba5e08c555d7e6f192217f890b83cd46c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657034308; 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=DcCi0CvhgnGZc2L8VuIDn/AQPk51qHJIcqY/0ux2Dzw=; b=Sgwk1wHuiY5LfVSNURbobIt8yj90kfCgcWo2zfI6GGTpqqPBjtAEJjD+3azJZMO7ldfhPy pW67sgGCyAz3o3jESvFCX1xRfbwdGT8l7Q8t3eC3C2gxgkpy7eKmz5JpDDyxtmYjhcJo6G 0N1az/m/DAXmeUUAYlVIJzv0C+jbi8r03YYxCry41PGPpHe5rxKqJA9XSZr1m0V1mp7frk ptrWavw5gF1/1UWWa20U+9iccEA0TRfSEs0B62Ow47BGqKxhaSf9lvolW8OoegZRAqLWkr GCQ/S/3DGKh+wL1qsYSOyzeizESHzREybbRbXysgBBs5VMUViXoWGzfhMtu78Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657034308; a=rsa-sha256; cv=none; b=faKrPATKEgJbNxCceFMJeNYBaPjZzx1E+XagqIgVMK08MlA22DlKBpgF0OjDpRhL20pg1Q M4E+kYFXmukraii6NFkPp4SUVhSx7QrI0Gjk9GgP9eWNYbVTftSCQfJ1Y1Wzrc+cmebXUL mTmodSsSE5GNQq/tMwbWCd9Pn8WAMBo5IyKiFRWG+F5Y+M3i5BDQfrZqjFIWJ0QMdbySl8 autACw3fRlaLXzyyVlgaDUbCQbJL+DnYykMlxf5osGgUFTqw+QCKWlzzJb+0GettwGimzg HxCK18JVFl5OMWEVYFPb8KuCUR8xeK62d0CcUGYo08tjiyKGQhG+kX59gUV0Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=f058359ba5e08c555d7e6f192217f890b83cd46c commit f058359ba5e08c555d7e6f192217f890b83cd46c Author: Tom Jones AuthorDate: 2022-07-05 15:03:51 +0000 Commit: Tom Jones CommitDate: 2022-07-05 15:18:05 +0000 xargs: terminate if line replacement cannot be constructed If the line with replacement cannot be constructed xargs should terminate as documented in the man page We encounter this error, but gnu/xargs doesn't because they have a much larger limit for created outputs (~10000 lines). Reviewed by: oshogbo Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35574 --- usr.bin/xargs/strnsubst.c | 15 ++++++++++----- usr.bin/xargs/xargs.c | 8 ++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c index d826d33c0967..1fa35d453f49 100644 --- a/usr.bin/xargs/strnsubst.c +++ b/usr.bin/xargs/strnsubst.c @@ -12,11 +12,12 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include -void strnsubst(char **, const char *, const char *, size_t); +bool strnsubst(char **, const char *, const char *, size_t); /* * Replaces str with a string consisting of str with match replaced with @@ -26,16 +27,19 @@ void strnsubst(char **, const char *, const char *, size_t); * str as well as the new contents are handled in an appropriate manner. * If replstr is NULL, then that internally is changed to a nil-string, so * that we can still pretend to do somewhat meaningful substitution. - * No value is returned. + * + * Returns true if truncation was needed to do the replacement, true if + * truncation was not required. */ -void +bool strnsubst(char **str, const char *match, const char *replstr, size_t maxsize) { char *s1, *s2, *this; + bool error = false; s1 = *str; if (s1 == NULL) - return; + return false; /* * If maxsize is 0 then set it to the length of s1, because we have * to duplicate s1. XXX we maybe should double-check whether the match @@ -67,6 +71,7 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize) if ((strlen(s2) + strlen(s1) + strlen(replstr) - strlen(match) + 1) > maxsize) { strlcat(s2, s1, maxsize); + error = true; goto done; } strncat(s2, s1, (uintptr_t)this - (uintptr_t)s1); @@ -76,7 +81,7 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize) strcat(s2, s1); done: *str = s2; - return; + return error; } #ifdef TEST diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 2825a26f4dfa..7b664cfde1cc 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -73,7 +74,7 @@ static void prerun(int, char *[]); static int prompt(void); static void run(char **); static void usage(void); -void strnsubst(char **, const char *, const char *, size_t); +bool strnsubst(char **, const char *, const char *, size_t); static pid_t xwait(int block, int *status); static void xexit(const char *, const int); static void waitchildren(const char *, int); @@ -517,7 +518,10 @@ prerun(int argc, char *argv[]) while (--argc) { *tmp = *avj++; if (repls && strstr(*tmp, replstr) != NULL) { - strnsubst(tmp++, replstr, inpline, (size_t)Sflag); + if (strnsubst(tmp++, replstr, inpline, (size_t)Sflag)) { + warnx("comamnd line cannot be assembled, too long"); + xexit(*argv, 1); + } if (repls > 0) repls--; } else {