From ae282f782ef5669a7996687c021b1a255804241a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 11 Jul 2017 13:34:11 +0200 Subject: [PATCH] Fix #5803: Null map element in onridephoto (#5852) --- src/openrct2/world/map_animation.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index 4cee6835b6..cc4249071c 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -312,6 +312,8 @@ static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint3 mapElement = map_get_first_element_at(x >> 5, y >> 5); do { + if (mapElement == NULL) + break; if (mapElement->base_height != baseZ) continue; if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK)