From owner-svn-src-head@freebsd.org  Mon Sep 21 19:03:14 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A13863F97B1;
 Mon, 21 Sep 2020 19:03:14 +0000 (UTC)
 (envelope-from arichardson@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 "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BwDNd3dWCz3S6q;
 Mon, 21 Sep 2020 19:03:13 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25D7012DC6;
 Mon, 21 Sep 2020 19:03:13 +0000 (UTC)
 (envelope-from arichardson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08LJ3Cp1030760;
 Mon, 21 Sep 2020 19:03:12 GMT (envelope-from arichardson@FreeBSD.org)
Received: (from arichardson@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08LJ3CIa030759;
 Mon, 21 Sep 2020 19:03:12 GMT (envelope-from arichardson@FreeBSD.org)
Message-Id: <202009211903.08LJ3CIa030759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arichardson set sender to
 arichardson@FreeBSD.org using -f
From: Alex Richardson <arichardson@FreeBSD.org>
Date: Mon, 21 Sep 2020 19:03:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r365969 - head/contrib/one-true-awk
X-SVN-Group: head
X-SVN-Commit-Author: arichardson
X-SVN-Commit-Paths: head/contrib/one-true-awk
X-SVN-Commit-Revision: 365969
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Sep 2020 19:03:17 -0000

Author: arichardson
Date: Mon Sep 21 19:03:12 2020
New Revision: 365969
URL: https://svnweb.freebsd.org/changeset/base/365969

Log:
  Fix another UBSan error in awk
  
  This applies my upstreamed fix: https://github.com/onetrueawk/awk/commit/ad9bd2f40a89ec9533b92254b86a756cf4f40fd4
  Found By:	UBSan

Modified:
  head/contrib/one-true-awk/lex.c

Modified: head/contrib/one-true-awk/lex.c
==============================================================================
--- head/contrib/one-true-awk/lex.c	Mon Sep 21 19:03:07 2020	(r365968)
+++ head/contrib/one-true-awk/lex.c	Mon Sep 21 19:03:12 2020	(r365969)
@@ -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: