From b418ee5a4ce39acb7f7ac38558552de5e251ae48 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 20 Apr 2008 21:38:20 +0000 Subject: (svn r12809) -Fix (r1704): Possible out of bounds array access. --- src/aircraft_cmd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/aircraft_cmd.cpp') diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index b96a87e04..e1ebdba0f 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -191,15 +191,17 @@ void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal) { 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); -- cgit v1.2.3-54-g00ecf