From 32438ef6d0ec37bd4af909ca8ef4b64594519067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 17 Feb 2017 09:02:50 +0100 Subject: [PATCH] Check for NULL element in get_ride_queue_end --- src/openrct2/peep/peep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c index 41cf45da80..c860c34b2f 100644 --- a/src/openrct2/peep/peep.c +++ b/src/openrct2/peep/peep.c @@ -9921,6 +9921,10 @@ static void get_ride_queue_end(sint16 *x, sint16 *y, sint16 *z){ rct_xy16 result = { 0, 0 }; rct_map_element *mapElement = map_get_first_element_at(*x / 32, *y / 32); + if (mapElement == NULL) { + return; + } + bool found = false; do{ if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE)