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

(svn r16523) -Fix (rNewPool): Segfault when small ufos were heading for deleted vehicles.

release/1.0
frosch 2009-06-06 10:40:16 +00:00
parent 59ae226ab1
commit 0b8ceb3007
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/disaster_cmd.cpp
View File

@ -314,7 +314,7 @@ static bool DisasterTick_Ufo(DisasterVehicle *v)
} else { } else {
/* Target a vehicle */ /* Target a vehicle */
Vehicle *u_tmp = Vehicle::Get(v->dest_tile); Vehicle *u_tmp = Vehicle::Get(v->dest_tile);
if (u_tmp->type != VEH_ROAD || !IsRoadVehFront(u_tmp)) { if (u_tmp == NULL || u_tmp->type != VEH_ROAD || !IsRoadVehFront(u_tmp)) {
delete v; delete v;
return false; return false;
} }
@ -402,7 +402,7 @@ static bool DisasterTick_Aircraft(DisasterVehicle *v, uint16 image_override, boo
if (v->current_order.GetDestination() == 2) { if (v->current_order.GetDestination() == 2) {
if (GB(v->tick_counter, 0, 2) == 0) { if (GB(v->tick_counter, 0, 2) == 0) {
Industry *i = Industry::Get(v->dest_tile); Industry *i = Industry::Get(v->dest_tile); // Industry destructor calls ReleaseDisastersTargetingIndustry, so this is valid
int x = TileX(i->xy) * TILE_SIZE; int x = TileX(i->xy) * TILE_SIZE;
int y = TileY(i->xy) * TILE_SIZE; int y = TileY(i->xy) * TILE_SIZE;
uint32 r = Random(); uint32 r = Random();
@ -420,7 +420,7 @@ static bool DisasterTick_Aircraft(DisasterVehicle *v, uint16 image_override, boo
v->current_order.SetDestination(2); v->current_order.SetDestination(2);
v->age = 0; v->age = 0;
Industry *i = Industry::Get(v->dest_tile); Industry *i = Industry::Get(v->dest_tile); // Industry destructor calls ReleaseDisastersTargetingIndustry, so this is valid
DestructIndustry(i); DestructIndustry(i);
SetDParam(0, i->town->index); SetDParam(0, i->town->index);