ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB Serialize: Fix game title check

This commit is contained in:
Vicki Pfau 2017-08-19 12:01:04 -07:00
parent ce07344c7d
commit 8ee270f3f6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -33,6 +33,7 @@ Bugfixes:
- GB Video: Fix potential hang when ending mode 0 - GB Video: Fix potential hang when ending mode 0
- GB Memory: Fix HDMA count starting in mode 0 (fixes mgba.io/i/855) - GB Memory: Fix HDMA count starting in mode 0 (fixes mgba.io/i/855)
- GB Memory: Actually load latch time from savestate - GB Memory: Actually load latch time from savestate
- GB Serialize: Fix game title check
Misc: Misc:
- GBA Timer: Use global cycles for timers - GBA Timer: Use global cycles for timers
- GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)

12
src/gb/serialize.c
View File

@ -23,7 +23,7 @@ void GBSerialize(struct GB* gb, struct GBSerializedState* state) {
STORE_32LE(gb->timing.masterCycles, 0, &state->masterCycles); STORE_32LE(gb->timing.masterCycles, 0, &state->masterCycles);
if (gb->memory.rom) { if (gb->memory.rom) {
memcpy(state->title, ((struct GBCartridge*) gb->memory.rom)->titleLong, sizeof(state->title)); memcpy(state->title, ((struct GBCartridge*) &gb->memory.rom[0x100])->titleLong, sizeof(state->title));
} else { } else {
memset(state->title, 0, sizeof(state->title)); memset(state->title, 0, sizeof(state->title));
} }
@ -86,9 +86,13 @@ bool GBDeserialize(struct GB* gb, const struct GBSerializedState* state) {
} }
bool canSgb = ucheck >= GB_SAVESTATE_MAGIC + 2; bool canSgb = ucheck >= GB_SAVESTATE_MAGIC + 2;
if (gb->memory.rom && memcmp(state->title, ((struct GBCartridge*) gb->memory.rom)->titleLong, sizeof(state->title))) { if (gb->memory.rom && memcmp(state->title, ((struct GBCartridge*) &gb->memory.rom[0x100])->titleLong, sizeof(state->title))) {
mLOG(GB_STATE, WARN, "Savestate is for a different game"); LOAD_32LE(ucheck, 0, &state->versionMagic);
error = true; if (ucheck > GB_SAVESTATE_MAGIC + 2 || memcmp(state->title, ((struct GBCartridge*) gb->memory.rom)->titleLong, sizeof(state->title))) {
// There was a bug in previous versions where the memory address being compared was wrong
mLOG(GB_STATE, WARN, "Savestate is for a different game");
error = true;
}
} }
LOAD_32LE(ucheck, 0, &state->romCrc32); LOAD_32LE(ucheck, 0, &state->romCrc32);
if (ucheck != gb->romCrc32) { if (ucheck != gb->romCrc32) {