Thu Jan 20 21:26:20 2011 UTC ()

fix bug introduced in rev. 1.3: need to set the string before
converting it into a numerical value, otherwise we might get junk or crash


(drochner)

diff -r1.3 -r1.4 src/external/historical/nawk/dist/tran.c

--- src/external/historical/nawk/dist/tran.c 2010/11/07 22:55:26	1.3
+++ src/external/historical/nawk/dist/tran.c 2011/01/20 21:26:20	1.4

 @@ -343,34 +343,35 @@ char *setsval(Cell *vp, const char *s)	/
 	} else if (isrec(vp)) {
 		donefld = 0;	/* mark $1... invalid */
 		donerec = 1;
+	}
 	t = tostring(s);	/* in case it's self-assign */
 	if (freeable(vp))
 		xfree(vp->sval);
 	vp->tval &= ~NUM;
 	vp->tval |= STR;
 	vp->tval &= ~DONTFREE;
 	   dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n",
 		vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );
 	vp->sval = t;
 	if (&vp->fval == NF) {
 		donerec = 0;	/* mark $0 invalid */
 		f = getfval(vp);
 		setlastfld(f);
 		dprintf( ("setting NF to %g\n", f) );
+	}
-	return(vp->sval = t);
+	return(vp->sval);
+}
 Awkfloat getfval(Cell *vp)	/* get float val of a Cell */
+{
 	if ((vp->tval & (NUM | STR)) == 0)
 		funnyvar(vp, "read value of");
 	if (isfld(vp) && donefld == 0)
 		fldbld();
 	else if (isrec(vp) && donerec == 0)
 		recbld();
 	if (!isnum(vp)) {	/* not a number */
 		vp->fval = atof(vp->sval);	/* best guess */
 		if (is_number(vp->sval) && !(vp->tval&CON))