svn commit: r301689 - head/contrib/one-true-awk

Pedro F. Giffuni pfg at FreeBSD.org
Wed Jun 8 19:24:50 UTC 2016


Author: pfg
Date: Wed Jun  8 19:24:48 2016
New Revision: 301689
URL: https://svnweb.freebsd.org/changeset/base/301689

Log:
  one-true-awk: Avoid a NULL dereference.
  
  CID:		270862
  Obtained from:	NetBSD (CVS Rev. 1.8)
  MFC after:	2 weeks

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

Modified: head/contrib/one-true-awk/tran.c
==============================================================================
--- head/contrib/one-true-awk/tran.c	Wed Jun  8 18:47:00 2016	(r301688)
+++ head/contrib/one-true-awk/tran.c	Wed Jun  8 19:24:48 2016	(r301689)
@@ -333,7 +333,7 @@ char *setsval(Cell *vp, const char *s)	/
 		donefld = 0;	/* mark $1... invalid */
 		donerec = 1;
 	}
-	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;


More information about the svn-src-head mailing list