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

GBA: Fix crash if a 512kb flash save is loaded when a game has a 1Mb flash override

This commit is contained in:
Jeffrey Pfau 2015-05-15 01:54:07 -07:00
parent ec529a86c7
commit 284f4df31b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -24,6 +24,7 @@ Bugfixes:
- VFS: Fix resource leaks if some allocations fail - VFS: Fix resource leaks if some allocations fail
- Video: Fix an issue with very long filenames - Video: Fix an issue with very long filenames
- GBA Video: Blended sprites should never have other effects applied - GBA Video: Blended sprites should never have other effects applied
- GBA: Fix crash if a 512kb flash save is loaded when a game has a 1Mb flash override
Misc: Misc:
- Qt: Handle saving input settings better - Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints - Debugger: Free watchpoints in addition to breakpoints

7
src/gba/savedata.c
View File

@ -149,14 +149,17 @@ void GBASavedataInitFlash(struct GBASavedata* savedata, bool realisticTiming) {
GBALog(0, GBA_LOG_WARN, "Can't re-initialize savedata"); GBALog(0, GBA_LOG_WARN, "Can't re-initialize savedata");
return; return;
} }
size_t flashSize = SIZE_CART_FLASH512; int32_t flashSize = SIZE_CART_FLASH512;
if (savedata->type == SAVEDATA_FLASH1M) {
flashSize = SIZE_CART_FLASH1M;
}
off_t end; off_t end;
if (!savedata->vf) { if (!savedata->vf) {
end = 0; end = 0;
savedata->data = anonymousMemoryMap(SIZE_CART_FLASH1M); savedata->data = anonymousMemoryMap(SIZE_CART_FLASH1M);
} else { } else {
end = savedata->vf->size(savedata->vf); end = savedata->vf->size(savedata->vf);
if (end < SIZE_CART_FLASH512) { if (end < flashSize) {
savedata->vf->truncate(savedata->vf, SIZE_CART_FLASH1M); savedata->vf->truncate(savedata->vf, SIZE_CART_FLASH1M);
flashSize = SIZE_CART_FLASH1M; flashSize = SIZE_CART_FLASH1M;
} }