From 79db533abbe3886dadc659ab1b951f296fbb9425 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 17 Jan 2022 00:59:15 +0000 Subject: [PATCH] Fix nullptr deref evaluating train in slot conditional order with no slot See: #360 --- src/order_cmd.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index c64b0bf4be..388e7f66ea 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -2814,14 +2814,16 @@ VehicleOrderID ProcessConditionalOrder(const Order *order, const Vehicle *v, boo } case OCV_TRAIN_IN_SLOT: { TraceRestrictSlot* slot = TraceRestrictSlot::GetIfValid(order->GetXData()); - bool occupant = slot->IsOccupant(v->index); - if (occ == OCC_EQUALS || occ == OCC_NOT_EQUALS) { - if (!occupant && !dry_run) { - occupant = slot->Occupy(v->index); + if (slot != nullptr) { + bool occupant = slot->IsOccupant(v->index); + if (occ == OCC_EQUALS || occ == OCC_NOT_EQUALS) { + if (!occupant && !dry_run) { + occupant = slot->Occupy(v->index); + } + occ = (occ == OCC_EQUALS) ? OCC_IS_TRUE : OCC_IS_FALSE; } - occ = (occ == OCC_EQUALS) ? OCC_IS_TRUE : OCC_IS_FALSE; + skip_order = OrderConditionCompare(occ, occupant, value); } - if (slot != nullptr) skip_order = OrderConditionCompare(occ, occupant, value); break; } case OCV_FREE_PLATFORMS: {