hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

AVOID_UB: FileSelect_LoadGame out of bounds gBitFlags[-1] (#2527)

Browse Source
This commit is contained in:
Dragorn421
2025-05-12 13:25:22 +02:00
committed by GitHub
parent 39ae99c4cb
commit 0c6c112cb9
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@@ -1955,7 +1955,16 @@ void FileSelect_LoadGame(GameState* thisx) {
swordEquipValue =
(gEquipMasks[EQUIP_TYPE_SWORD] & gSaveContext.save.info.equips.equipment) >> (EQUIP_TYPE_SWORD * 4);
gSaveContext.save.info.equips.equipment &= gEquipNegMasks[EQUIP_TYPE_SWORD];
#ifndef AVOID_UB
//! @bug swordEquipValue can be 0 (EQUIP_VALUE_SWORD_NONE) here (typically, when first starting the game).
//! This leads to reading gBitFlags[-1] (out of bounds).
// gBitFlags[-1] turns out to be 0 in matching versions so this is inconsequential.
gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, swordEquipValue - 1);
#else
if (swordEquipValue != EQUIP_VALUE_SWORD_NONE) {
gSaveContext.save.info.inventory.equipment ^= OWNED_EQUIP_FLAG(EQUIP_TYPE_SWORD, swordEquipValue - 1);
}
#endif
}
#if PLATFORM_N64