From nobody Sun Aug 13 05:29:01 2023 X-Original-To: dev-commits-src-main@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 4RNmKv5sBxz4mWhJ; Sun, 13 Aug 2023 05:29:07 +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 4RNmKv4vKWz3dqT; Sun, 13 Aug 2023 05:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904547; 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=hsHkHapGnRMXHD/1Axbi+zwIVIiN2vZ3pS/KojUjk/s=; b=BuctThty8dFNuktNl2Lp8W0fCjNIOKesjcg2B6Rl821dV/uUD4kimp1/HjHW4qtRImuQ28 DtBzwwuRFKjaL3NOkXGB3DyxdhjgzHntbf8/OSMhYTLtvJhaXZ1Y2xkkJfXhP0PO5qNtfA rRZxvqKnzBrV7/BvqghYKIMTzqJqWFIx/ZhuvAFo0LxwYQWfJ4BHwTM6QNBqASU7vgLkUy zDrvwcwdOjyQVK42Po6DOFQ0qpDRYnL5WNbEnQMYFrOXKMCxXirywmQDXT67BSiBT2DENp uiRejToaJu1KrXRn25fJIYcL2I97n4WLwH+8jWGYdH5GWP16pznLe2fNtAMw0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904547; 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=hsHkHapGnRMXHD/1Axbi+zwIVIiN2vZ3pS/KojUjk/s=; b=rOloZ32y9JOP0YW4VEVsX2LjAH+q2nQg95XpvQ+YcSZd+IbnWTP48TUZ2fJyRhNugNm1w4 ri9Niji9+dFk09jh1Mu7JOPVbpdzrxsWhE6o0HXeQGtwZXQSfWMElUNDPnVca4Zn6qd7Zl itRqP1lYJNNbpLOjKt5rJCyPws/f2rGIg+HHrKHUQ/Iwozy7zYjFpQTpOuJoiGzBYDI8QZ vdA9w24DedmjsfiIPkNOUSzKf+QHxi9MTz3uJCxu/Q3WPLdMZ5kEOuyyefHutUmQn5CD/T bgqCFq3j+KoV7gkRGVtuXwPMvS5BbvNrMKrzvhxZa6f2qX0/c5e0+/Lzg4xYfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691904547; a=rsa-sha256; cv=none; b=slLg/5yqTmw4bfELHUhSE0YLR6eXzTQkt8QGT9Obh6AB6mG2aZbe6Bds3ntOKOQMoFbXSm ebrx+Qo7DB3tk/ZbPHV0Q/w8wyGep/SxOHBrE+gsRx3Ee+YqbuGNaNGIilsBzehnTBzPJJ lJe5p0YOBSwou07seFrv91xkRN2DTOsWq9Ryj4nbXxn5soviJR4kJxVjEGfsjxLRjkv4/B n7ENmAYe9kNe+Kv3lDvXhkyrisULs878bFGFSRkY3E1WgTt+nUdy06f8Ip+3eAKUohQlXj 2y1ih6+dFEx1Ar98XO1Q1Ul2VxCAES2DJSzEJE3NF8/CcLmr0k693OZmgGmv+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNmKv3Vn7zqRr; Sun, 13 Aug 2023 05:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5T7W0019772; Sun, 13 Aug 2023 05:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5T1Og019758; Sun, 13 Aug 2023 05:29:01 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:29:01 GMT Message-Id: <202308130529.37D5T1Og019758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ea46e63863df - main - Merge commit 'acb089b983171667467adc66f56a723b609ed22e' into kbsd/vis List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea46e63863df9bd36b65f7293092214f1937349e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ea46e63863df9bd36b65f7293092214f1937349e commit ea46e63863df9bd36b65f7293092214f1937349e Merge: 93626d543702 acb089b98317 Author: Kyle Evans AuthorDate: 2023-08-13 05:23:02 +0000 Commit: Kyle Evans CommitDate: 2023-08-13 05:23:02 +0000 Merge commit 'acb089b983171667467adc66f56a723b609ed22e' into kbsd/vis Highlights: - Some style fixes - Bumped mbbuf in istrsenvisx() to MB_LEN_MAX to avoid VLAs - mbslength cannot go negative, so make it unsigned - Further bounds checking & fix an additional overrun, with dlen == 0 - Avoid duplicate call to wcslen(start) contrib/libc-vis/unvis.3 | 25 +++++++++++-------- contrib/libc-vis/unvis.c | 6 ++--- contrib/libc-vis/vis.3 | 5 ++-- contrib/libc-vis/vis.c | 65 ++++++++++++++++++++++++++++++++++++++++-------- contrib/libc-vis/vis.h | 5 ++-- 5 files changed, 76 insertions(+), 30 deletions(-) diff --cc contrib/libc-vis/unvis.c index d96d231be96e,039fea5e93f9..f290d8db271a --- a/contrib/libc-vis/unvis.c +++ b/contrib/libc-vis/unvis.c @@@ -34,10 -34,9 +34,10 @@@ #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #else - __RCSID("$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $"); + __RCSID("$NetBSD: unvis.c,v 1.45 2022/04/19 20:32:15 rillig Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +__FBSDID("$FreeBSD$"); #include "namespace.h" #include