ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 23:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add UBFIX for null deref in sub_80D08CC

Browse Source
This commit is contained in:
Sierraffinity 2020-12-26 17:47:36 -08:00
parent 86fdd033c6
commit bafbf9240d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pokemon_storage_system.c
View File

@ -8408,8 +8408,13 @@ static void sub_80D08CC(void)
for (j = sMoveMonsPtr->minRow; j < rowCount; j++) for (j = sMoveMonsPtr->minRow; j < rowCount; j++)
{ {
struct BoxPokemon *boxMon = GetBoxedMonPtr(boxId, boxPosition); struct BoxPokemon *boxMon = GetBoxedMonPtr(boxId, boxPosition);
// UB: possible null dereference
#ifdef UBFIX
if (boxMon != NULL)
sMoveMonsPtr->boxMons[monArrayId] = *boxMon; sMoveMonsPtr->boxMons[monArrayId] = *boxMon;
#else
sMoveMonsPtr->boxMons[monArrayId] = *boxMon;
#endif
monArrayId++; monArrayId++;
boxPosition++; boxPosition++;
} }