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

(svn r16353) -Fix (r1): invalid read when OTTD savegame contains VEH_INVALID

release/1.0
smatz 2009-05-18 17:40:03 +00:00
parent 8808f3beea
commit a0ff6363e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/oldloader_sl.cpp
View File

@ -1260,7 +1260,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
uint type = ReadByte(ls); uint type = ReadByte(ls);
switch (type) { switch (type) {
default: return false; default: return false;
case 0x00 /* VEH_INVALID */: v = new (_current_vehicle_id) InvalidVehicle(); break; case 0x00 /* VEH_INVALID */: v = new (_current_vehicle_id) InvalidVehicle(); break;
case 0x25 /* MONORAIL */: case 0x25 /* MONORAIL */:
case 0x20 /* VEH_TRAIN */: v = new (_current_vehicle_id) Train(); break; case 0x20 /* VEH_TRAIN */: v = new (_current_vehicle_id) Train(); break;
case 0x21 /* VEH_ROAD */: v = new (_current_vehicle_id) RoadVehicle(); break; case 0x21 /* VEH_ROAD */: v = new (_current_vehicle_id) RoadVehicle(); break;

2
src/saveload/vehicle_sl.cpp
View File

@ -698,7 +698,7 @@ void Load_VEHS()
case VEH_AIRCRAFT: v = new (index) Aircraft(); break; case VEH_AIRCRAFT: v = new (index) Aircraft(); break;
case VEH_EFFECT: v = new (index) EffectVehicle(); break; case VEH_EFFECT: v = new (index) EffectVehicle(); break;
case VEH_DISASTER: v = new (index) DisasterVehicle(); break; case VEH_DISASTER: v = new (index) DisasterVehicle(); break;
case VEH_INVALID: v = new (index) InvalidVehicle(); break; case VEH_INVALID: /* Savegame shouldn't contain invalid vehicles */
default: NOT_REACHED(); default: NOT_REACHED();
} }