From: <the...@us...> - 2013-10-12 20:29:46
|
Revision: 4797 http://sourceforge.net/p/desmume/code/4797 Author: thelemonman Date: 2013-10-12 20:29:43 +0000 (Sat, 12 Oct 2013) Log Message: ----------- Don't segfault if the specified bios files aren't found. Modified Paths: -------------- trunk/desmume/src/NDSSystem.cpp Modified: trunk/desmume/src/NDSSystem.cpp =================================================================== --- trunk/desmume/src/NDSSystem.cpp 2013-10-08 16:53:09 UTC (rev 4796) +++ trunk/desmume/src/NDSSystem.cpp 2013-10-12 20:29:43 UTC (rev 4797) @@ -2235,9 +2235,12 @@ { //read arm7 bios from inputfile and flag it if it succeeds FILE *arm7inf = fopen(CommonSettings.ARM7BIOS,"rb"); - if (fread(MMU.ARM7_BIOS,1,16384,arm7inf) == 16384) - NDS_ARM7.BIOS_loaded = true; - fclose(arm7inf); + if (arm7inf) + { + if (fread(MMU.ARM7_BIOS,1,16384,arm7inf) == 16384) + NDS_ARM7.BIOS_loaded = true; + fclose(arm7inf); + } } //choose to use SWI emulation or routines from bios @@ -2290,9 +2293,12 @@ { //read arm9 bios from inputfile and flag it if it succeeds FILE* arm9inf = fopen(CommonSettings.ARM9BIOS,"rb"); - if (fread(MMU.ARM9_BIOS,1,4096,arm9inf) == 4096) - NDS_ARM9.BIOS_loaded = true; - fclose(arm9inf); + if (arm9inf) + { + if (fread(MMU.ARM9_BIOS,1,4096,arm9inf) == 4096) + NDS_ARM9.BIOS_loaded = true; + fclose(arm9inf); + } } //choose to use SWI emulation or routines from bios This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |