From 60db202ea751182710199b49c8c660fa63810167 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 10 Aug 2019 12:18:37 +0100 Subject: [PATCH] Return nullptr in get_sprite if out of range --- src/openrct2/world/Sprite.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index 084060c67f..97092a8205 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -85,6 +85,10 @@ rct_sprite* get_sprite(size_t sprite_idx) return nullptr; } openrct2_assert(sprite_idx < MAX_SPRITES, "Tried getting sprite %u", sprite_idx); + if (sprite_idx >= MAX_SPRITES) + { + return nullptr; + } return &_spriteList[sprite_idx]; }