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

Fix for potential UB in CameraObjectReset2
This commit is contained in:
GriffinR
2024-08-29 14:11:58 -04:00
committed by GitHub
+6 -1
View File
@@ -2453,7 +2453,12 @@ u8 CameraObjectGetFollowedObjectId(void)
void CameraObjectReset2(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) u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)