Date: Sat, 10 Jul 2021 17:12:52 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: 086165376b02 - stable/12 - Revert r348518 Message-ID: <202107101712.16AHCqd7088321@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=086165376b029983658816a16a44e5ec0b4f0363 commit 086165376b029983658816a16a44e5ec0b4f0363 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2019-06-02 20:52:21 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-07-10 17:11:15 +0000 Revert r348518 It should not have happened. The change is actually in upstream and I misread the diffs. (cherry picked from commit adb46ac4c0a64c2cd1fbf46022f4aafb4e605cd3) --- contrib/one-true-awk/tran.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/one-true-awk/tran.c b/contrib/one-true-awk/tran.c index 837f3742bc4f..8577a0b11d31 100644 --- a/contrib/one-true-awk/tran.c +++ b/contrib/one-true-awk/tran.c @@ -366,7 +366,7 @@ char *setsval(Cell *vp, const char *s) /* set string val of a Cell */ if (donerec == 0) recbld(); } - t = tostring(s); /* in case it's self-assign */ + t = s ? tostring(s) : tostring(""); /* in case it's self-assign */ if (freeable(vp)) xfree(vp->sval); vp->tval &= ~(NUM|CONVC|CONVO);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107101712.16AHCqd7088321>