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

Fix stack overflow due to excessive recursion in LinkRefresher

Browse Source 
Clamp recursion limit to maximum of 64

See: #198
This commit is contained in:
Jonathan G Rennison
2020-10-21 17:22:24 +01:00
parent abade81e63
commit 83a128e8a9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/linkgraph/refresh.cpp
View File

@@ -209,7 +209,7 @@ const Order *LinkRefresher::PredictNextOrder(const Order *cur, const Order *next
const Order *skip_to = this->vehicle->orders.list->GetNextDecisionNode( const Order *skip_to = this->vehicle->orders.list->GetNextDecisionNode(
this->vehicle->orders.list->GetOrderAt(next->GetConditionSkipToOrder()), num_hops, this_cargo_mask); this->vehicle->orders.list->GetOrderAt(next->GetConditionSkipToOrder()), num_hops, this_cargo_mask);
assert(this_cargo_mask == this->cargo_mask); assert(this_cargo_mask == this->cargo_mask);
if (skip_to != nullptr && num_hops < this->vehicle->orders.list->GetNumOrders() && skip_to != next) { if (skip_to != nullptr && num_hops < min<uint>(64, this->vehicle->orders.list->GetNumOrders()) && skip_to != next) {
/* Make copies of capacity tracking lists. There is potential /* Make copies of capacity tracking lists. There is potential
* for optimization here: If the vehicle never refits we don't * for optimization here: If the vehicle never refits we don't
* need to copy anything. Also, if we've seen the branched link * need to copy anything. Also, if we've seen the branched link

2
src/order_cmd.cpp
View File

@@ -542,7 +542,7 @@ VehicleOrderID OrderList::GetIndexOfOrder(const Order *order) const
*/ */
const Order *OrderList::GetNextDecisionNode(const Order *next, uint hops, CargoTypes &cargo_mask) const const Order *OrderList::GetNextDecisionNode(const Order *next, uint hops, CargoTypes &cargo_mask) const
{ {
if (hops > this->GetNumOrders() || next == nullptr) return nullptr; if (hops > min<uint>(64, this->GetNumOrders()) || next == nullptr) return nullptr;
if (next->IsType(OT_CONDITIONAL)) { if (next->IsType(OT_CONDITIONAL)) {
if (next->GetConditionVariable() != OCV_UNCONDITIONALLY) return next; if (next->GetConditionVariable() != OCV_UNCONDITIONALLY) return next;