folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Fix EXPECT bookkeeping to avoid reference after free error

Browse source
This commit is contained in:
Mark Pizzolato 2018-06-11 02:35:07 -07:00
parent 5700b1f477
commit 4fff142444
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scp.c
View file

@ -11819,6 +11819,9 @@ if (i != exp->size) { /* Found? */
ep->cnt, (ep->cnt == 1) ? "" : "es"); ep->cnt, (ep->cnt == 1) ? "" : "es");
} }
else { else {
uint32 after = ep->after;
int32 switches = ep->switches;
if (ep->act && *ep->act) { if (ep->act && *ep->act) {
sim_debug (exp->dbit, exp->dptr, "Initiating actions: %s\n", ep->act); sim_debug (exp->dbit, exp->dptr, "Initiating actions: %s\n", ep->act);
} }
@ -11833,9 +11836,9 @@ if (i != exp->size) { /* Found? */
sim_exp_clr_tab (exp, ep); /* delete it */ sim_exp_clr_tab (exp, ep); /* delete it */
} }
sim_activate (&sim_expect_unit, /* schedule simulation stop when indicated */ sim_activate (&sim_expect_unit, /* schedule simulation stop when indicated */
(ep->switches & EXP_TYP_TIME) ? (switches & EXP_TYP_TIME) ?
(int32)((sim_timer_inst_per_sec ()*ep->after)/1000000.0) : (int32)((sim_timer_inst_per_sec ()*after)/1000000.0) :
ep->after); after);
} }
/* Matched data is no longer available for future matching */ /* Matched data is no longer available for future matching */
exp->buf_data = exp->buf_ins = 0; exp->buf_data = exp->buf_ins = 0;