From nobody Fri Jul 22 13:03: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 4Lq8kn0m49z4XCGQ; Fri, 22 Jul 2022 13:03:29 +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 4Lq8kn097Xz49vR; Fri, 22 Jul 2022 13:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658495009; 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=TBseyEfQNE7Jm5Wkr250OSQvLRGBx5yDNtze2Vq7Whg=; b=sqorj3G1iq+d4jjfZChlnai59OQCKny0hrwG9iEC6uLBumeYOQ8UVK36Xn2otpxr4D5Jkb MiJjr7YKPWC0/yCNHwRJ7f7HMK21InB55UU+iGQY3LT9NzBHhcKaGYQqiTnVkcDlzgPUM5 XIO0KEQi0NHufnYUEEdrFU8DKafTEhvyNgqSjbmn1cAWOr0c5KyLIeCdTmap7ZkZCeNkd6 y/OYqQXuE/c/GeQKk05CxV1UqI1F7p3enTFH6fxkMp0NYScT3hvBVVszeskylQdCn/7SYc 56SygVXrBuGpjpTYilTxclmA5bvWxklbh6pka2pVMK6svTmhCAmMhZ6uDKwjvA== 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 4Lq8km6Gj4z126j; Fri, 22 Jul 2022 13:03: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 26MD3Sj6004837; Fri, 22 Jul 2022 13:03:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MD3SVT004836; Fri, 22 Jul 2022 13:03:28 GMT (envelope-from git) Date: Fri, 22 Jul 2022 13:03:28 GMT Message-Id: <202207221303.26MD3SVT004836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2bd84a3d19e7 - stable/13 - telnet: Fix telnet segfault when invalid set or help help commands 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2bd84a3d19e7603bef56a4b5c2e18ff969df3ab6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658495009; 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=TBseyEfQNE7Jm5Wkr250OSQvLRGBx5yDNtze2Vq7Whg=; b=vLTON5Na8FSjqUIbNMDJm39BVk3t106ilAjN1onAf5le5b6c2RWuwaWwoCtUJMBc2Bk9qt G6ciYixZTLVXanCGY3xNQvcU0cWVos5U5/Sp8kIiZo7Dw477hHd2jsi/7sQr7ROpfkAXD7 V+UxfCmvrYVMjdPCwG+ZSG6/uafiqMwxLdvNxaLWIojw14+G7fVU5yiuY/T7GlqiZUxWNI +pmtJ1ySw0uvaZG1QXM+sZYQyg4s533ufpZO/NrhwPXAEdh1uctuQ8ryqyyFFAp9Ggyp3C WzmSfT3+iDx8wBNPjAFN7L+NIJxwQZR+o0ZkQYyX/ndU9CsrmKXKCl198jXbqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658495009; a=rsa-sha256; cv=none; b=tXc0sixMTwQ4U16tBafsKVUuPr44ObiXE4fx4WE/J7FGuovRQRIwucvs8S7bColisBIVs0 1AYSthrlgN4xvKkZrMjM+l/8IrsE4Pj5eULN0YtPNrjUvKIzDn0xA7JFfsLN3T2O2GM8GR 1azi3k1soNAm0uipCqFMXwvZzVOmmIvXfu3YwSX75PdKVfpVgfGWY4giY/8uTPaxn66ZJQ Ef5Ja+L+OGSLGD+ysr4DpgACY7MV8R7ZIicoOAvmVQddJhGRqhjwaOeHsS7V2Kf2Tfq1/c UCEZbj1RYCl1uHgJOIofZdRju8+Hf9KQJDjPM5t3OBK5+ntQ9NMd8zEhiWOkJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd84a3d19e7603bef56a4b5c2e18ff969df3ab6 commit 2bd84a3d19e7603bef56a4b5c2e18ff969df3ab6 Author: Cy Schubert AuthorDate: 2022-07-14 04:42:06 +0000 Commit: Cy Schubert CommitDate: 2022-07-22 13:03:03 +0000 telnet: Fix telnet segfault when invalid set or help help commands Silently ignore invalid set ' ' and invalid help help commands. This is the same fix applied by NetBSD in hg commit 1019940:4f248823eaff. PR: 265097 Reported by: Simon Josefsson Obtained from: NetBSD hg commit 1019940:4f248823eaff NetBSD PR/56918 (cherry picked from commit a7399ea2dd7810e76dcfd52248764cb8004d49a4) --- contrib/telnet/telnet/commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index 21e973209d9b..fd4597941724 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -938,7 +938,7 @@ setcmd(int argc, char *argv[]) } ct = getset(argv[1]); - if (ct == 0) { + if (ct == 0 || !(ct->name && ct->name[0] != ' ')) { c = GETTOGGLE(argv[1]); if (c == 0) { fprintf(stderr, "'%s': unknown argument ('set ?' for help).\n", @@ -1014,7 +1014,7 @@ unsetcmd(int argc, char *argv[]) while (argc--) { name = *argv++; ct = getset(name); - if (ct == 0) { + if (ct == 0 || !(ct->name && ct->name[0] != ' ')) { c = GETTOGGLE(name); if (c == 0) { fprintf(stderr, "'%s': unknown argument ('unset ?' for help).\n", @@ -2694,7 +2694,7 @@ help(int argc, char *argv[]) printf("?Ambiguous help command %s\n", arg); else if (c == (Command *)0) printf("?Invalid help command %s\n", arg); - else + else if (c->help) printf("%s\n", c->help); } return 0;