cpp/openttd-patchpack/source Changeset - r11945:c65ebbed2ff7

Changeset - r11945:c65ebbed2ff7

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

smatz - 15 years ago 2009-05-18 17:40:03
smatz@openttd.org

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

2 files changed with 2 insertions and 2 deletions:

src/saveload/oldloader_sl.cpp

src/saveload/vehicle_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -1260,7 +1260,7 @@ bool LoadOldVehicle(LoadgameState *ls, i @@
 			uint type = ReadByte(ls);
 			switch (type) {
 				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 0x20 /* VEH_TRAIN    */: v = new (_current_vehicle_id) Train();           break;
 				case 0x21 /* VEH_ROAD     */: v = new (_current_vehicle_id) RoadVehicle();     break;

src/saveload/vehicle_sl.cpp

➞

Show inline comments

@@ @@ -698,7 +698,7 @@ void Load_VEHS() @@
 			case VEH_AIRCRAFT: v = new (index) Aircraft();        break;
 			case VEH_EFFECT:   v = new (index) EffectVehicle();   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();
+		}

0 comments (0 inline, 0 general)