From 64c7cc51b5d24b1957ec1c7e8fd919d6783ab543 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 31 Dec 2010 15:53:46 +0000 Subject: [PATCH] (svn r21679) -Fix (r21642): reading a just freed variable --- src/vehicle.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index ce1f2abbab..219ac872df 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1747,9 +1747,10 @@ void Vehicle::BeginLoading() current_order.MakeLoading(true); UpdateVehicleTimetable(this, true); - for (Order *order = this->GetOrder(this->cur_order_index); - order != NULL && order->IsType(OT_AUTOMATIC); - order = order->next) { + const Order *order = this->GetOrder(this->cur_order_index); + while (order != NULL && order->IsType(OT_AUTOMATIC)) { + /* Delete order effectively deletes order, so get the next before deleting it. */ + order = order->next; DeleteOrder(this, this->cur_order_index); }