summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AmatCoder <AmatCoder@users.noreply.github.com>2019-03-19 21:00:13 +0100
committer GitHub <noreply@github.com>2019-03-19 21:00:13 +0100
commit66a4629631b8796896a4dc3bd080399b8531ada0 (patch)
treed001b629991c7131e6a1a3f749a9dc9289a23a79
parentf0c72dc1aaed2f2a12295f1adbabcdc754dd2e08 (diff)
dsk_dsk.cpp: Avoid segfault if double sided DSK image is loaded on simple sided disk device
MAME crashed if user was trying to load a dsk image with more heads or tracks than disk device supports. Now the error 'Incompatible image format' is raised.
-rw-r--r--src/lib/formats/dsk_dsk.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/formats/dsk_dsk.cpp b/src/lib/formats/dsk_dsk.cpp
index 5b019fb53d1..c90579b68d0 100644
--- a/src/lib/formats/dsk_dsk.cpp
+++ b/src/lib/formats/dsk_dsk.cpp
@@ -362,6 +362,12 @@ bool dsk_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
skip = 2;
}
int tracks = header[0x30];
+
+ int img_tracks, img_heads;
+ image->get_maximal_geometry(img_tracks, img_heads);
+ if (tracks > img_tracks || heads > img_heads)
+ return false;
+
uint64_t track_offsets[84*2];
int cnt =0;
if (!extendformat) {