mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Fix #9079. Null derference checked for when getting banner element.

Browse Source 
Unsure how the save managed to get in this state
This commit is contained in:
duncanspumpkin
2019-04-09 18:39:33 +01:00
parent 736924ba21
commit e2e4c1d942
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/actions/BannerSetStyleAction.hpp
View File

@@ -96,6 +96,11 @@ public:
}
break;
case BannerSetStyleType::NoEntry:
if (tileElement->AsBanner() == nullptr)
{
log_error("Tile element was not a banner.");
return MakeResult(GA_ERROR::UNKNOWN, STR_NONE);
}
break;
default:
log_error("Invalid type: %u", _type);
@@ -161,6 +166,12 @@ public:
case BannerSetStyleType::NoEntry:
{
BannerElement* bannerElement = tileElement->AsBanner();
if (bannerElement == nullptr)
{
log_error("Tile element was not a banner.");
return MakeResult(GA_ERROR::UNKNOWN, STR_NONE);
}
banner->flags &= ~BANNER_FLAG_NO_ENTRY;
banner->flags |= (_parameter != 0) ? BANNER_FLAG_NO_ENTRY : 0;
uint8_t allowedEdges = 0xF;