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

Avoid NULL pointer dereference when examining a device with no units. #95

Browse source
This commit is contained in:
Mark Pizzolato 2014-01-09 12:03:51 -08:00
parent b61e5ae176
commit fd4a3acbad
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scp.c
View file

@ -1185,7 +1185,7 @@ if (dptr->flags & DEV_DEBUG) {
fprintf (st, "%-30s\tDisables specific debugging for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisables specific debugging for device %s\n", buf, sim_dname (dptr));
} }
} }
if ((dptr->modifiers) && (dptr->numunits != 1)) { if ((dptr->modifiers) && (dptr->units) && (dptr->numunits != 1)) {
if (dptr->units->flags & UNIT_DISABLE) { if (dptr->units->flags & UNIT_DISABLE) {
fprint_header (st, &found, header); fprint_header (st, &found, header);
sprintf (buf, "set %sn ENABLE", sim_dname (dptr)); sprintf (buf, "set %sn ENABLE", sim_dname (dptr));
@ -1239,7 +1239,7 @@ if (dptr->flags & DEV_DEBUG) {
sprintf (buf, "show %s DEBUG", sim_dname (dptr)); sprintf (buf, "show %s DEBUG", sim_dname (dptr));
fprintf (st, "%-30s\tDisplays debugging status for device %s\n", buf, sim_dname (dptr)); fprintf (st, "%-30s\tDisplays debugging status for device %s\n", buf, sim_dname (dptr));
} }
if ((dptr->modifiers) && (dptr->numunits != 1)) { if ((dptr->modifiers) && (dptr->units) && (dptr->numunits != 1)) {
for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) { for (mptr = dptr->modifiers; mptr->mask != 0; mptr++) {
if ((!MODMASK(mptr,MTAB_VUN)) && MODMASK(mptr,MTAB_XTD)) if ((!MODMASK(mptr,MTAB_VUN)) && MODMASK(mptr,MTAB_XTD))
continue; /* skip device only modifiers */ continue; /* skip device only modifiers */