summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2005-09-20 11:07:33 +0000
committerpeter1138 <peter1138@openttd.org>2005-09-20 11:07:33 +0000
commit2f0616e9f2c821830a8533fd7bde0c1660604215 (patch)
tree0f6fb9714f38a41015de406aab18b51ef596e0fa
parenta3b3c3cf31da40e0ee03badde5cbd4bc3931f357 (diff)
downloadopenttd-2f0616e9f2c821830a8533fd7bde0c1660604215.tar.xz
(svn r2965) Fix: newgrf: Add bounds checking to VehicleChangeInfo for vehicles and change
station special case to vehicle special case.
-rw-r--r--newgrf.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/newgrf.c b/newgrf.c
index ace4d72d7..901d84df2 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -1046,10 +1046,13 @@ static void VehicleChangeInfo(byte *buf, int len)
return;
}
- if (feature != GSF_STATION)
+ if (feature <= GSF_AIRCRAFT) {
+ if (engine + numinfo > _vehcounts[feature]) {
+ grfmsg(GMS_ERROR, "VehicleChangeInfo: Last engine ID %d out of bounds (max %d), skipping.", engine + numinfo, _vehcounts[feature]);
+ return;
+ }
ei = &_engine_info[engine + _vehshifts[feature]];
- /* XXX - Should there not be a check to see if 'ei' is NULL
- when it is used in the switch below?? -- TrueLight */
+ }
buf += 5;