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

SCP: Fix sim_disk to avoid potential reference to uninitialized context structure. Fix #194

Browse source
This commit is contained in:
Mark Pizzolato 2015-03-19 13:52:33 -07:00
parent 89a3783281
commit 46d7bfc660
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/simh.doc
View file

Binary file not shown.

3
sim_disk.c
View file

@ -366,12 +366,11 @@ return SCPE_OK;
t_stat sim_disk_show_capac (FILE *st, UNIT *uptr, int32 val, void *desc) t_stat sim_disk_show_capac (FILE *st, UNIT *uptr, int32 val, void *desc)
{ {
struct disk_context *ctx = (struct disk_context *)uptr->disk_ctx;
const char *cap_units = "B"; const char *cap_units = "B";
DEVICE *dptr = find_dev_from_unit (uptr); DEVICE *dptr = find_dev_from_unit (uptr);
t_offset capac = ((t_offset)uptr->capac)*((dptr->flags & DEV_SECTORS) ? 512 : 1); t_offset capac = ((t_offset)uptr->capac)*((dptr->flags & DEV_SECTORS) ? 512 : 1);
if (ctx->capac_factor == 2) if ((dptr->dwidth / dptr->aincr) == 16)
cap_units = "W"; cap_units = "W";
if (capac) { if (capac) {
if (capac >= (t_offset) 1000000) if (capac >= (t_offset) 1000000)