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

Fix possible null dereferences

Browse Source
This commit is contained in:
Michał Janiszewski
2017-01-13 12:35:26 +01:00
parent 90f7a3cf4f
commit 09ecf0b73c
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/interface/Theme.cpp
View File

@@ -257,6 +257,10 @@ static void ThrowThemeLoadException()
json_t * UIThemeWindowEntry::ToJson() const
{
const WindowThemeDesc * wtDesc = GetWindowThemeDescriptor(WindowClass);
if (wtDesc == nullptr)
{
return nullptr;
}
json_t * jsonColours = json_array();
for (uint8 i = 0; i < wtDesc->NumColours; i++) {
@@ -370,6 +374,10 @@ json_t * UITheme::ToJson() const
for (const UIThemeWindowEntry & entry : Entries)
{
const WindowThemeDesc * wtDesc = GetWindowThemeDescriptor(entry.WindowClass);
if (wtDesc == nullptr)
{
return nullptr;
}
json_object_set_new(jsonEntries, wtDesc->WindowClassSZ, entry.ToJson());
}
@@ -704,6 +712,10 @@ extern "C"
if (entry == nullptr)
{
const WindowThemeDesc * desc = GetWindowThemeDescriptor(wc);
if (desc == nullptr)
{
return 0;
}
return desc->DefaultTheme.Colours[index];
}
else
@@ -725,6 +737,10 @@ extern "C"
else
{
const WindowThemeDesc * desc = GetWindowThemeDescriptor(wc);
if (desc == nullptr)
{
return;
}
entry.Theme = desc->DefaultTheme;
}
@@ -820,12 +836,20 @@ extern "C"
uint8 theme_desc_get_num_colours(rct_windowclass wc)
{
const WindowThemeDesc * desc = GetWindowThemeDescriptor(wc);
if (desc == nullptr)
{
return 0;
}
return desc->NumColours;
}
rct_string_id theme_desc_get_name(rct_windowclass wc)
{
const WindowThemeDesc * desc = GetWindowThemeDescriptor(wc);
if (desc == nullptr)
{
return STR_EMPTY;
}
return desc->WindowName;
}