mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity

protect objects against invalid allocation ids

Browse Source
This commit is contained in:
Ted John
2016-07-03 18:02:18 +01:00
parent 80381cfaa0
commit 52928e1e08
26 changed files with 78 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/object/RideObject.cpp
View File

@@ -46,6 +46,9 @@ RideObject::~RideObject()
void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
{
stream->Read(&_legacyType);
_legacyType.name = 0;
_legacyType.description = 0;
_legacyType.images_offset = 0;
GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME);
GetStringTable()->Read(context, stream, OBJ_STRING_ID_DESCRIPTION);
@@ -311,6 +314,10 @@ void RideObject::Unload()
language_free_object_string(_legacyType.name);
language_free_object_string(_legacyType.description);
gfx_object_free_images(_legacyType.images_offset, GetImageTable()->GetCount());
_legacyType.name = 0;
_legacyType.description = 0;
_legacyType.images_offset = 0;
}
void RideObject::DrawPreview(rct_drawpixelinfo * dpi) const