From d61220569d5e27c48c32b66bdc03ea431f22f243 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Thu, 27 Jun 2024 16:13:17 +0200
Subject: [PATCH] fix for potential UB in CameraObjectReset2

---
 src/event_object_movement.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 43a5d86fe..184081294 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -2453,7 +2453,15 @@ u8 CameraObjectGetFollowedObjectId(void)
 
 void CameraObjectReset2(void)
 {
+#ifdef UBFIX
+    struct Sprite* cameraObject = FindCameraObject();
+
+    if (cameraObject == NULL)
+        return;
+    cameraObject->data[1] = 2;
+#else
     FindCameraObject()->data[1] = 2;
+#endif
 }
 
 u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)