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

Fix undefined behaviour in Vehicle destructor

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-06-06 18:38:18 +01:00
parent e1fb35b16f
commit b5dea7f236
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vehicle.cpp
View File

@@ -977,6 +977,10 @@ void Vehicle::PreDestructor()
StopGlobalFollowVehicle(this);
ReleaseDisastersTargetingVehicle(this->index);
/* sometimes, eg. for disaster vehicles, when company bankrupts, when removing crashed/flooded vehicles,
* it may happen that vehicle chain is deleted when visible */
if (this->IsDrawn()) this->MarkAllViewportsDirty();
}
Vehicle::~Vehicle()
@@ -988,9 +992,12 @@ Vehicle::~Vehicle()
if (this->breakdowns_since_last_service) _vehicles_to_pay_repair.erase(this);
/* sometimes, eg. for disaster vehicles, when company bankrupts, when removing crashed/flooded vehicles,
* it may happen that vehicle chain is deleted when visible */
if (this->IsDrawn()) this->MarkAllViewportsDirty();
if (this->type < VEH_BEGIN || this->type >= VEH_COMPANY_END) {
/* sometimes, eg. for disaster vehicles, when company bankrupts, when removing crashed/flooded vehicles,
* it may happen that vehicle chain is deleted when visible.
* Do not redo this for vehicle types where it is done in PreDestructor(). */
if (this->IsDrawn()) this->MarkAllViewportsDirty();
}
Vehicle *v = this->Next();
this->SetNext(NULL);