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

(svn r26101) -Fix: NULL pointer dereference when one can't allocate an order list but wants to make implicit orders

release/1.4
rubidium 2013-11-25 11:08:21 +00:00
parent 573f6dcd34
commit 18beaac571
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vehicle.cpp
View File

@ -2012,8 +2012,7 @@ void Vehicle::BeginLoading()
} }
} }
} else if (!suppress_implicit_orders && } else if (!suppress_implicit_orders &&
((this->orders.list == NULL && OrderList::CanAllocateItem()) || ((this->orders.list == NULL ? OrderList::CanAllocateItem() : this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID)) &&
this->orders.list->GetNumOrders() < MAX_VEH_ORDER_ID) &&
Order::CanAllocateItem()) { Order::CanAllocateItem()) {
/* Insert new implicit order */ /* Insert new implicit order */
Order *implicit_order = new Order(); Order *implicit_order = new Order();