From 4424c2e6fb263a613a6dbd1bdda246796ad1d330 Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sun, 19 Oct 2008 17:16:26 +0000 Subject: (svn r14492) -Fix [FS#2366] (r14482): Conditional orders could lead to an infinite loop on path look-ahead. Don't refactor things that don't want to be refactored, folks. And some comments can't hurt either. --- src/train_cmd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 9e10b5169..be41cf556 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2857,6 +2857,7 @@ public: VehicleOrderID next = ProcessConditionalOrder(order, this->v); if (next != INVALID_VEH_ORDER_ID) { this->index = next; + /* Don't increment next, so no break here. */ continue; } break; @@ -2864,7 +2865,10 @@ public: default: break; } - } while (++this->index != this->v->cur_order_index); + /* Don't increment inside the while because otherwise conditional + * orders can lead to an infinite loop. */ + ++this->index; + } while (this->index != this->v->cur_order_index); return false; } -- cgit v1.2.3-70-g09d2