gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-25 14:40:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Out-of-bounds read, if NewGRF stations provided no spritesets.

Browse Source
This commit is contained in:
frosch 2025-04-28 17:46:39 +02:00 committed by frosch
parent 0f1ef96ca1
commit 0c6426cb2d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_station.cpp
View File

@ -522,7 +522,8 @@ uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [
/* virtual */ const SpriteGroup *StationResolverObject::ResolveReal(const RealSpriteGroup *group) const /* virtual */ const SpriteGroup *StationResolverObject::ResolveReal(const RealSpriteGroup *group) const
{ {
if (this->station_scope.st == nullptr || !Station::IsExpected(this->station_scope.st)) { if (this->station_scope.st == nullptr || !Station::IsExpected(this->station_scope.st)) {
return group->loading[0]; if (!group->loading.empty()) return group->loading[0];
return nullptr;
} }
uint cargo = 0; uint cargo = 0;
@ -564,7 +565,8 @@ uint32_t Waypoint::GetNewGRFVariable(const ResolverObject &, uint8_t variable, [
} }
} }
return group->loading[0]; if (!group->loading.empty()) return group->loading[0];
return nullptr;
} }
GrfSpecFeature StationResolverObject::GetFeature() const GrfSpecFeature StationResolverObject::GetFeature() const