Merge pull request #663 from cawtds/ub-fix-camera-object

Fix for potential UB in CameraObjectReset2
pret · Aug 29, 2024 · 4f7b8c5 · 4f7b8c5
2 parents f155bf5 + 466a69a
commit 4f7b8c5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
@@ -2453,7 +2453,12 @@ u8 CameraObjectGetFollowedObjectId(void)
 
 void CameraObjectReset2(void)
 {
-    FindCameraObject()->data[1] = 2;
+    struct Sprite *cameraObject = FindCameraObject();
+#ifdef UBFIX
+    if (cameraObject == NULL)
+        return;
+#endif
+    cameraObject->data[1] = 2;
 }
 
 u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)