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

UBFIX: sprite.c (#1442)

Browse Source 
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
This commit is contained in:
gAlfonso-bit
2021-05-23 10:10:55 -04:00
committed by GitHub
parent ef6d91b0e3
commit a454f9c187
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gflib/sprite.c
+5 -2
View File
@@ -452,6 +452,10 @@ void SortSprites(void)
// Although this doesn't result in a bug in the ROM, // Although this doesn't result in a bug in the ROM,
// the behavior is undefined. // the behavior is undefined.
j--; j--;
#ifdef UBFIX
if (j == 0)
break;
#endif
sprite1 = &gSprites[sSpriteOrder[j - 1]]; sprite1 = &gSprites[sSpriteOrder[j - 1]];
sprite2 = &gSprites[sSpriteOrder[j]]; sprite2 = &gSprites[sSpriteOrder[j]];
@@ -661,8 +665,7 @@ void ResetOamRange(u8 a, u8 b)
for (i = a; i < b; i++) for (i = a; i < b; i++)
{ {
struct OamData *oamBuffer = gMain.oamBuffer; gMain.oamBuffer[i] = *(struct OamData *)&gDummyOamData;
oamBuffer[i] = *(struct OamData *)&gDummyOamData;
} }
} }