all repos — mgba @ df3f2796f7dca510480755b3952f2033dc1d2097

mGBA Game Boy Advance Emulator

GBA: Error check to make sure ROM and BIOS mapping succeed
Jeffrey Pfau jeffrey@endrift.com
Tue, 09 Dec 2014 15:19:51 -0800
commit

df3f2796f7dca510480755b3952f2033dc1d2097

parent

7edf934a59ef29ad76e23aa935cdef8557a178b2

1 files changed, 10 insertions(+), 1 deletions(-)

jump to
M src/gba/gba.c → src/gba/gba.c 
@@ -425,6 +425,10 @@ gba->romVf = vf;
 	gba->pristineRomSize = vf->seek(vf, 0, SEEK_END);
 	vf->seek(vf, 0, SEEK_SET);
 	gba->pristineRom = vf->map(vf, SIZE_CART0, MAP_READ);
+	if (!gba->pristineRom) {
+		GBALog(gba, GBA_LOG_WARN, "Couldn't map ROM");
+		return;
+	}
 	gba->memory.rom = gba->pristineRom;
 	gba->activeFile = fname;
 	gba->memory.romSize = gba->pristineRomSize;

@@ -437,7 +441,12 @@ }
 
 void GBALoadBIOS(struct GBA* gba, struct VFile* vf) {
 	gba->biosVf = vf;
-	gba->memory.bios = vf->map(vf, SIZE_BIOS, MAP_READ);
+	uint32_t* bios = vf->map(vf, SIZE_BIOS, MAP_READ);
+	if (!bios) {
+		GBALog(gba, GBA_LOG_WARN, "Couldn't map BIOS");
+		return;
+	}
+	gba->memory.bios = bios;
 	gba->memory.fullBios = 1;
 	uint32_t checksum = GBAChecksum(gba->memory.bios, SIZE_BIOS);
 	GBALog(gba, GBA_LOG_DEBUG, "BIOS Checksum: 0x%X", checksum);