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

PDP11 & VAX: Avoid RQ DEVICE uname memory leaks

Browse source 
Additional UNITs from 4 up to 254 are replicated from Unit 0.
If the UNIT->uname has already been populated, we could leak memory if
it isn't released before copying from the template UNIT.
This commit is contained in:
Mark Pizzolato 2022-03-04 18:28:30 -08:00
parent 7aba63028c
commit 2fb741046d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PDP11/pdp11_rq.c
View file

@ -3029,9 +3029,13 @@ if (!plugs_inited ) {
rq_devmap[i]->units[RQ_QUEUE].flags = UNIT_DIS; rq_devmap[i]->units[RQ_QUEUE].flags = UNIT_DIS;
sprintf (uname, "%s-QUESVC", rq_devmap[i]->name); sprintf (uname, "%s-QUESVC", rq_devmap[i]->name);
sim_set_uname (&rq_devmap[i]->units[RQ_QUEUE], uname); sim_set_uname (&rq_devmap[i]->units[RQ_QUEUE], uname);
free (rq_devmap[i]->units[0].uname); /* We're going to use unit 0 as a template for extended units */
rq_devmap[i]->units[0].uname = NULL; /* free the only potentially allocated pointer in the structure */
for (d = 0; d < rq_devmap[i]->numunits - 2; d++) { for (d = 0; d < rq_devmap[i]->numunits - 2; d++) {
if (d >= RQ_NUMDR) { if (d >= RQ_NUMDR) {
rq_devmap[i]->units[d] = rq_devmap[i]->units[0]; free (rq_devmap[i]->units[d].uname); /* Make sure to not lose a populated uname pointer */
rq_devmap[i]->units[d].uname = NULL;
rq_devmap[i]->units[d] = rq_devmap[i]->units[0]; /* Overwrite additional unit with unit0 as a template */
rq_devmap[i]->units[d].flags |= UNIT_DIS; rq_devmap[i]->units[d].flags |= UNIT_DIS;
rq_devmap[i]->units[d].flags &= ~UNIT_DISABLE; rq_devmap[i]->units[d].flags &= ~UNIT_DISABLE;
} }