Date: Sun, 13 Aug 2023 05:29:01 GMT From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ea46e63863df - main - Merge commit 'acb089b983171667467adc66f56a723b609ed22e' into kbsd/vis Message-ID: <202308130529.37D5T1Og019758@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <kevans@FreeBSD.org> AuthorDate: 2023-08-13 05:23:02 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> 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 <sys/types.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308130529.37D5T1Og019758>