Improve assert

bengsig · bengsig · commit 095f53338bda · 2022-11-22T17:00:26.000Z
diff --git a/src/rwlcoderun.c b/src/rwlcoderun.c
@@ -14,6 +14,7 @@
  *
  * History
  *
+ * bengsig  16-nov-2022 - Improve assert
  * bengsig  15-nov-2022 - Core dump in flush local sql upon exit
  * bengsig   3-nov-2022 - Harden code with rwl_type throughout
  * bengsig  31-oct-2022 - Add better queue time via $queueeverytiming:on
@@ -102,10 +103,10 @@ void rwlcoderun ( rwl_xeqenv *xev)
 
 	sb4 pvnum = xev->rwm->code[pc].ceint2;
 	/*ASSERT*/
-	if (pvnum<0)
+	if (pvnum<0 || (ub4)pvnum>=xev->varcount)
 	{
-	  rwlexecsevere(xev,  &xev->rwm->code[pc].cloc, "[rwlcoderun-nopvnum:%s;%d;%d;%d]"
-	  , codename, xev->pcdepth, pc, pvnum);
+	  rwlexecsevere(xev,  &xev->rwm->code[pc].cloc, "[rwlcoderun-badpvnum:%s;%d;%d;%d;%d]"
+	  , codename, xev->pcdepth, pc, pvnum, xev->varcount);
 	  return;
 	}
 	pproc = xev->evar+pvnum;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* History`
`16`	`16`	`*`
	`17`	`+ * bengsig 16-nov-2022 - Improve assert`
`17`	`18`	`* bengsig 15-nov-2022 - Core dump in flush local sql upon exit`
`18`	`19`	`* bengsig 3-nov-2022 - Harden code with rwl_type throughout`
`19`	`20`	`* bengsig 31-oct-2022 - Add better queue time via $queueeverytiming:on`
`@@ -102,10 +103,10 @@ void rwlcoderun ( rwl_xeqenv *xev)`
`102`	`103`
`103`	`104`	`sb4 pvnum = xev->rwm->code[pc].ceint2;`
`104`	`105`	`/ASSERT/`
`105`		`- if (pvnum<0)`
	`106`	`+ if (pvnum<0 \|\| (ub4)pvnum>=xev->varcount)`
`106`	`107`	`{`
`107`		`- rwlexecsevere(xev, &xev->rwm->code[pc].cloc, "[rwlcoderun-nopvnum:%s;%d;%d;%d]"`
`108`		`- , codename, xev->pcdepth, pc, pvnum);`
	`108`	`+ rwlexecsevere(xev, &xev->rwm->code[pc].cloc, "[rwlcoderun-badpvnum:%s;%d;%d;%d;%d]"`
	`109`	`+ , codename, xev->pcdepth, pc, pvnum, xev->varcount);`
`109`	`110`	`return;`
`110`	`111`	`}`
`111`	`112`	`pproc = xev->evar+pvnum;`