mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Fix reading out of bounds in cc_object_count

Browse Source
This commit is contained in:
Hielke Morsink
2022-08-30 11:31:00 +02:00
parent 7078776de3
commit ced6f1280f
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -59,6 +59,7 @@
#include "Viewport.h"
#include <algorithm>
#include <array>
#include <cmath>
#include <cstdarg>
#include <cstdlib>
@@ -1265,13 +1266,29 @@ static int32_t cc_load_object(InteractiveConsole& console, const arguments_t& ar
return 0;
}
constexpr std::array _objectTypeNames = {
"Rides",
"Small Scenery",
"Large Scenery",
"Walls",
"Banners",
"Paths",
"Path Additions",
"Scenery groups",
"Park entrances",
"Water",
"ScenarioText",
"Terrain Surface",
"Terrain Edges",
"Stations",
"Music",
"Footpath Surface",
"Footpath Railings",
"Audio",
};
static_assert(_objectTypeNames.size() == EnumValue(ObjectType::Count));
static int32_t cc_object_count(InteractiveConsole& console, [[maybe_unused]] const arguments_t& argv)
{
const utf8* object_type_names[] = {
"Rides", "Small scenery", "Large scenery", "Walls", "Banners",
"Paths", "Path Additions", "Scenery groups", "Park entrances", "Water",
};
for (auto objectType : ObjectTypes)
{
int32_t entryGroupIndex = 0;
@@ -1283,7 +1300,7 @@ static int32_t cc_object_count(InteractiveConsole& console, [[maybe_unused]] con
}
}
console.WriteFormatLine(
"%s: %d/%d", object_type_names[EnumValue(objectType)], entryGroupIndex,
"%s: %d/%d", _objectTypeNames[EnumValue(objectType)], entryGroupIndex,
object_entry_group_counts[EnumValue(objectType)]);
}