From 46d7bfc6607dc611b216011d9e27f796a2c39251 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 19 Mar 2015 13:52:33 -0700 Subject: [PATCH] SCP: Fix sim_disk to avoid potential reference to uninitialized context structure. Fix #194 --- doc/simh.doc | Bin 215040 -> 215040 bytes sim_disk.c | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/simh.doc b/doc/simh.doc index 387b0e192683cf17d91c269142d0ee16c054b679..9574a8e6399641e820cdc9594ac5964271d55b4c 100644 GIT binary patch delta 6939 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 delta 7030 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 U%-q_<&ScEk$%2q6obB{K0CbInjsO4v diff --git a/sim_disk.c b/sim_disk.c index 992e3a42..1f0438a0 100644 --- a/sim_disk.c +++ b/sim_disk.c @@ -366,12 +366,11 @@ return SCPE_OK; 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"; DEVICE *dptr = find_dev_from_unit (uptr); 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"; if (capac) { if (capac >= (t_offset) 1000000)