summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/event_object_movement.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 1d06ddc84..12ef4acdc 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -2275,7 +2275,18 @@ u8 CameraObjectGetFollowedObjectId(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;
+#endif // UBFIX
}
u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)