Date: Sat, 10 Jul 2021 17:12:57 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a711add6ceff - stable/12 - Fix another UBSan error in awk Message-ID: <202107101712.16AHCv3B088423@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a711add6ceffc58dabb930a0fdd685ddbac7b83c commit a711add6ceffc58dabb930a0fdd685ddbac7b83c Author: Alex Richardson <arichardson@FreeBSD.org> AuthorDate: 2020-09-21 19:03:12 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-07-10 17:11:15 +0000 Fix another UBSan error in awk This applies my upstreamed fix: https://github.com/onetrueawk/awk/commit/ad9bd2f40a89ec9533b92254b86a756cf4f40fd4 Found By: UBSan (cherry picked from commit 1116946093d537569a29692a6a86de59cd49384e) --- contrib/one-true-awk/lex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/one-true-awk/lex.c b/contrib/one-true-awk/lex.c index 8e689f1a682a..e537df4151da 100644 --- a/contrib/one-true-awk/lex.c +++ b/contrib/one-true-awk/lex.c @@ -467,9 +467,8 @@ int word(char *w) int c, n; n = binsearch(w, keywords, sizeof(keywords)/sizeof(keywords[0])); -/* BUG: this ought to be inside the if; in theory could fault (daniel barrett) */ - kp = keywords + n; if (n != -1) { /* found in table */ + kp = keywords + n; yylval.i = kp->sub; switch (kp->type) { /* special handling */ case BLTIN:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107101712.16AHCv3B088423>