From 9b80d4b1511fc649a21b21a1f4ca6ab89b3b2c66 Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 16 Jan 2020 00:40:42 +0100 Subject: [PATCH] Made the sanity fatal() milder in rom_load_linear() as well. --- src/rom.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/rom.c b/src/rom.c index 17c31e3ba..8d8c23e99 100644 --- a/src/rom.c +++ b/src/rom.c @@ -174,18 +174,14 @@ rom_load_linear(wchar_t *fn, uint32_t addr, int sz, int off, uint8_t *ptr) /* Make sure we only look at the base-256K offset. */ if (addr >= 0x40000) - { addr = 0; - } else - { addr &= 0x03ffff; - } if (ptr != NULL) { if (fseek(f, off, SEEK_SET) == -1) fatal("rom_load_linear(): Error seeking to the beginning of the file\n"); - if (fread(ptr+addr, 1, sz, f) != sz) + if (fread(ptr+addr, 1, sz, f) > sz) fatal("rom_load_linear(): Error reading data\n"); }