dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit maximum recursion depth in StationViewWindow::EstimateDestinations

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-09 01:49:18 +01:00
parent 99055c22cb
commit 3807f0551d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/station_gui.cpp
View File

@@ -1493,9 +1493,9 @@ struct StationViewWindow : public Window {
* @param count Size of the batch of cargo. * @param count Size of the batch of cargo.
* @param dest CargoDataEntry to save the results in. * @param dest CargoDataEntry to save the results in.
*/ */
void EstimateDestinations(CargoID cargo, StationID source, StationID next, uint count, CargoDataEntry *dest) void EstimateDestinations(CargoID cargo, StationID source, StationID next, uint count, CargoDataEntry *dest, uint depth = 0)
{ {
if (Station::IsValidID(next) && Station::IsValidID(source)) { if (depth <= 128 && Station::IsValidID(next) && Station::IsValidID(source)) {
CargoDataEntry tmp; CargoDataEntry tmp;
const FlowStatMap &flowmap = Station::Get(next)->goods[cargo].flows; const FlowStatMap &flowmap = Station::Get(next)->goods[cargo].flows;
FlowStatMap::const_iterator map_it = flowmap.find(source); FlowStatMap::const_iterator map_it = flowmap.find(source);
@@ -1528,7 +1528,7 @@ struct StationViewWindow : public Window {
if (child->GetStation() == next) { if (child->GetStation() == next) {
dest->InsertOrRetrieve(next)->Update(estimate); dest->InsertOrRetrieve(next)->Update(estimate);
} else { } else {
EstimateDestinations(cargo, source, child->GetStation(), estimate, dest); EstimateDestinations(cargo, source, child->GetStation(), estimate, dest, depth + 1);
} }
} }
} }