mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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.
release/0.7
michi_cc 2008-10-19 17:16:26 +00:00
parent d832626bb9
commit 6815cc52fe
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/train_cmd.cpp
View File

@ -2857,6 +2857,7 @@ public:
VehicleOrderID next = ProcessConditionalOrder(order, this->v); VehicleOrderID next = ProcessConditionalOrder(order, this->v);
if (next != INVALID_VEH_ORDER_ID) { if (next != INVALID_VEH_ORDER_ID) {
this->index = next; this->index = next;
/* Don't increment next, so no break here. */
continue; continue;
} }
break; break;
@ -2864,7 +2865,10 @@ public:
default: default:
break; 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; return false;
} }