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

Add UBFIX for null deref in CameraObjectReset2

Browse Source
This commit is contained in:
Sierraffinity
2020-12-26 17:23:36 -08:00
parent d74f739e05
commit b155c307ea
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/event_object_movement.c
View File

@@ -2275,7 +2275,18 @@ u8 CameraObjectGetFollowedObjectId(void)
void CameraObjectReset2(void) void CameraObjectReset2(void)
{ {
// UB: Possible null dereference
#ifdef UBFIX
struct Sprite *cameraObject;
cameraObject = FindCameraObject();
if (cameraObject != NULL)
{
cameraObject->data[1] = 2;
}
#else
FindCameraObject()->data[1] = 2; FindCameraObject()->data[1] = 2;
#endif // UBFIX
} }
u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)