From b155c307eadea2e5bd168abfce7df677d0edba8f Mon Sep 17 00:00:00 2001
From: Sierraffinity <sierra@domoreaweso.me>
Date: Sat, 26 Dec 2020 17:23:36 -0800
Subject: [PATCH] Add UBFIX for null deref in CameraObjectReset2

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

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 1d06ddc84d..12ef4acdc0 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)