dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracerestrict slots: Fix a crash bug when selling a train that's in a tracerestrict slot. Again a use of an invalid iterator. We need to check FIRST if range.first and reange.second are equal. After erasing the range those iterators are invalid.

Browse Source 
(cherry picked from commit 7aea2ced3ced5ec4201fbad9c206451aad057718)
This commit is contained in:
keldorkatarn
2018-04-28 00:42:55 +02:00
committed by Jonathan G Rennison
parent e9f5d80440
commit acdeaa715e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tracerestrict.cpp
View File

@@ -1563,15 +1563,20 @@ void TraceRestrictSlot::PreCleanPool()
} }
/** Remove vehicle ID from all slot occupants */ /** Remove vehicle ID from all slot occupants */
void TraceRestrictRemoveVehicleFromAllSlots(VehicleID id) void TraceRestrictRemoveVehicleFromAllSlots(VehicleID vehicle_id)
{ {
auto range = slot_vehicle_index.equal_range(id); const auto range = slot_vehicle_index.equal_range(vehicle_id);
for (auto it = range.first; it != range.second; ++it) { for (auto it = range.first; it != range.second; ++it) {
TraceRestrictSlot *slot = TraceRestrictSlot::Get(it->second); auto slot = TraceRestrictSlot::Get(it->second);
container_unordered_remove(slot->occupants, id); container_unordered_remove(slot->occupants, vehicle_id);
} }
const bool anything_to_erase = range.first != range.second;
slot_vehicle_index.erase(range.first, range.second); slot_vehicle_index.erase(range.first, range.second);
if (range.first != range.second) InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS);
if (anything_to_erase) InvalidateWindowClassesData(WC_TRACE_RESTRICT_SLOTS);
} }
/** Replace all instance of a vehicle ID with another, in all slot occupants */ /** Replace all instance of a vehicle ID with another, in all slot occupants */