(svn r12809) -Fix (r1704): Possible out of bounds array access.
--- a/src/aircraft_cmd.cpp Sun Apr 20 21:36:41 2008 +0000
+++ b/src/aircraft_cmd.cpp Sun Apr 20 21:38:20 2008 +0000
@@ -191,15 +191,17 @@
{
const AircraftVehicleInfo* avi = AircraftVehInfo(engine);
int spritenum = avi->image_index;
- SpriteID sprite = (6 + _aircraft_sprite[spritenum]);
+ SpriteID sprite = 0;
if (is_custom_sprite(spritenum)) {
sprite = GetCustomVehicleIcon(engine, DIR_W);
if (sprite == 0) {
spritenum = _orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index;
- sprite = (6 + _aircraft_sprite[spritenum]);
}
}
+ if (sprite == 0) {
+ sprite = 6 + _aircraft_sprite[spritenum];
+ }
DrawSprite(sprite, pal, x, y);