Mercurial > hg > openttd

changeset 11950:13ee49bccba3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16353) -Fix (r1): invalid read when OTTD savegame contains VEH_INVALID
author smatz <smatz@openttd.org>
date Mon, 18 May 2009 17:40:03 +0000
parents c89301974eb8
children 8bbe44fa53e2
files src/saveload/oldloader_sl.cpp src/saveload/vehicle_sl.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/saveload/oldloader_sl.cpp
+++ b/src/saveload/oldloader_sl.cpp
@@ -1260,7 +1260,7 @@
 			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;
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -698,7 +698,7 @@
 			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();
 		}