From 485db59b1166f05407ff3f338b48e1011b737be0 Mon Sep 17 00:00:00 2001 From: pfg Date: Wed, 8 Jun 2016 19:39:44 +0000 Subject: [PATCH] Revert r301689 - one-true-awk: Avoid a NULL dereference. I got this wrong and the coverity report doesn't match the NetBSD change, which was thought for a different version. The change wouldn't hurt but let's wait until upstream figures this out. --- 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 237295af0611..e364ebd81928 100644 --- a/contrib/one-true-awk/tran.c +++ b/contrib/one-true-awk/tran.c @@ -333,7 +333,7 @@ char *setsval(Cell *vp, const char *s) /* set string val of a Cell */ donefld = 0; /* mark $1... invalid */ donerec = 1; } - t = s ? tostring(s) : tostring(""); /* in case it's self-assign */ + t = tostring(s); /* in case it's self-assign */ if (freeable(vp)) xfree(vp->sval); vp->tval &= ~NUM;