diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-06-26 04:04:22 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-06-26 22:51:41 -0400 |
| commit | 88bd618496b955da4505a8c106dd135235d02542 (patch) | |
| tree | cd9083138e346cb42910409ee3a91490f37382e7 /src/union_room.c | |
| parent | 8116790c0880cbe03e8d14efe88bf6000f283819 (diff) | |
port UBFIXes from emerald
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/union_room.c b/src/union_room.c index 575fcd60e..1fb7ee849 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1628,7 +1628,11 @@ static bool32 IsPartnerActivityAcceptable(u32 activity, u32 group) if (group == 0xFF) return TRUE; + #ifndef UBFIX if (group <= NELEMS(sAcceptedActivityIds)) // UB: <= may access data outside the array + #else + if (group < NELEMS(sAcceptedActivityIds)) + #endif { const u8 *bytes = sAcceptedActivityIds[group]; |