diff --git a/src/openrct2/object_list.c b/src/openrct2/object_list.c index 10af4128a7..befe71a3fc 100644 --- a/src/openrct2/object_list.c +++ b/src/openrct2/object_list.c @@ -134,8 +134,10 @@ void object_create_identifier_name(char* string_buffer, size_t size, const rct_o * ecx = entry_type */ sint32 find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, uint8* entry_index){ + if ((entry->flags & 0xF) >= _countof(object_entry_groups)) { + return 0; + } *entry_type = entry->flags & 0xF; - rct_object_entry_group entry_group = object_entry_groups[*entry_type]; for (*entry_index = 0; *entry_index < object_entry_group_counts[*entry_type];