diff options
| author | Sierraffinity <sierra@domoreaweso.me> | 2020-12-26 17:23:36 -0800 |
|---|---|---|
| committer | Sierraffinity <sierra@domoreaweso.me> | 2020-12-26 17:25:51 -0800 |
| commit | b155c307eadea2e5bd168abfce7df677d0edba8f (patch) | |
| tree | f67adb33af9c3aafc482dd98c5423b7ce91841f6 /src | |
| parent | d74f739e05c4ed9646a9e42b4400243474dd9fa8 (diff) | |
Add UBFIX for null deref in CameraObjectReset2
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_object_movement.c | 11 |
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) |