mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12809) -Fix (r1704): Possible out of bounds array access.

release/0.7
peter1138 2008-04-20 21:38:20 +00:00
parent f7d3d879c5
commit b418ee5a4c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aircraft_cmd.cpp
View File

@ -191,15 +191,17 @@ void DrawAircraftEngine(int x, int y, EngineID engine, SpriteID pal)
{ {
const AircraftVehicleInfo* avi = AircraftVehInfo(engine); const AircraftVehicleInfo* avi = AircraftVehInfo(engine);
int spritenum = avi->image_index; int spritenum = avi->image_index;
SpriteID sprite = (6 + _aircraft_sprite[spritenum]); SpriteID sprite = 0;
if (is_custom_sprite(spritenum)) { if (is_custom_sprite(spritenum)) {
sprite = GetCustomVehicleIcon(engine, DIR_W); sprite = GetCustomVehicleIcon(engine, DIR_W);
if (sprite == 0) { if (sprite == 0) {
spritenum = _orig_aircraft_vehicle_info[engine - AIRCRAFT_ENGINES_INDEX].image_index; 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); DrawSprite(sprite, pal, x, y);