dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1515 from GriffinRichards/fix-saveblockchunk

Browse Source 
Disallow negative sizes in SAVEBLOCK_CHUNK
This commit is contained in:
GriffinR
2021-10-13 13:30:53 -04:00
committed by GitHub
parent f55a8cb688 5860e0e937
commit b9f6dd128d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/save.c
+6 -5
View File
@@ -43,11 +43,12 @@ static u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location);
// (u8 *)structure was removed from the first statement of the macro in Emerald. // (u8 *)structure was removed from the first statement of the macro in Emerald.
// This is because malloc is used to allocate addresses so storing the raw // This is because malloc is used to allocate addresses so storing the raw
// addresses should not be done in the offsets information. // addresses should not be done in the offsets information.
#define SAVEBLOCK_CHUNK(structure, chunkNum) \ #define SAVEBLOCK_CHUNK(structure, chunkNum) \
{ \ { \
chunkNum * SECTOR_DATA_SIZE, \ chunkNum * SECTOR_DATA_SIZE, \
min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) \ sizeof(structure) >= chunkNum * SECTOR_DATA_SIZE ? \
} \ min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) : 0 \
}
static const struct SaveSectionOffsets sSaveSectionOffsets[] = static const struct SaveSectionOffsets sSaveSectionOffsets[] =
{ {