From 18beaac57180d3b3020ec34e318c7d7aa805fd12 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 25 Nov 2013 11:08:21 +0000 Subject: (svn r26101) -Fix: NULL pointer dereference when one can't allocate an order list but wants to make implicit orders --- src/vehicle.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 6a25d080b..2037da7cd 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2012,8 +2012,7 @@ void Vehicle::BeginLoading() } } } else if (!suppress_implicit_orders && - ((this->orders.list == NULL && OrderList::CanAllocateItem()) || - this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID) && + ((this->orders.list == NULL ? OrderList::CanAllocateItem() : this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID)) && Order::CanAllocateItem()) { /* Insert new implicit order */ Order *implicit_order = new Order(); -- cgit v1.2.3-54-g00ecf