~ubuntu-branches/debian/squeeze/openttd/squeeze

« back to all changes in this revision

Viewing changes to src/newgrf_cargo.cpp

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman
Date: 2008-08-08 11:07:05 UTC
mfrom: (1.1.4 upstream) (2.1.1 lenny)
Revision ID: james.westby@ubuntu.com-20080808110705-zq0eo95c4pexg70i

http://bugs.debian.org/493714

* New upstream release.
- Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714

files removed:
bin/data/generictrams_v0.4.grf

files modified:
changelog.txt

config.lib

debian/README.Debian

debian/changelog

debian/config

debian/control

debian/rules

docs/openttd.6

known-bugs.txt

os/debian/changelog

os/win32/installer/install.nsi

projects/determineversion.vbs

readme.txt

src/ai/ai.cpp

src/aircraft_cmd.cpp

src/articulated_vehicles.cpp

src/autoreplace_cmd.cpp

src/blitter/factory.hpp

src/bridge.h

src/command_type.h

src/console_cmds.cpp

src/depot_gui.cpp

src/economy.cpp

src/economy_type.h

src/elrail.cpp

src/engine_gui.cpp

src/fileio.cpp

src/fileio.h

src/fios.cpp

src/fios.h

src/fontcache.cpp

src/genworld_gui.cpp

src/gfx.cpp

src/gfx_type.h

src/industry_cmd.cpp

src/landscape.cpp

src/lang/brazilian_portuguese.txt

src/lang/bulgarian.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/icelandic.txt

src/lang/italian.txt

src/lang/korean.txt

src/lang/piglatin.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/simplified_chinese.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/swedish.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/misc_cmd.cpp

src/misc_gui.cpp

src/mixer.cpp

src/network/core/config.h

src/network/network.cpp

src/network/network_client.cpp

src/network/network_server.cpp

src/network/network_udp.cpp

src/newgrf.cpp

src/newgrf_cargo.cpp

src/newgrf_config.h

src/newgrf_engine.cpp

src/newgrf_house.cpp

src/newgrf_industries.cpp

src/newgrf_station.cpp

src/oldloader.cpp

src/openttd.cpp

src/order_gui.cpp

src/ottdres.rc.in

src/player_gui.cpp

src/player_type.h

src/players.cpp

src/rail_cmd.cpp

src/rev.cpp.in

src/road_cmd.cpp

src/roadveh_cmd.cpp

src/roadveh_gui.cpp

src/saveload.cpp

src/settings.cpp

src/ship_cmd.cpp

src/signal.cpp

src/slope_func.h

src/spritecache.cpp

src/spriteloader/png.cpp

src/terraform_gui.cpp

src/town_cmd.cpp

src/train.h

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/vehicle.cpp

src/vehicle_func.h

src/vehicle_gui.cpp

src/win32.cpp

Show diffs side-by-side

added added

removed removed

src/newgrf_cargo.cpp

/* $Id: newgrf_cargo.cpp 12142 2008-02-15 10:52:10Z frosch $ */

/* $Id: newgrf_cargo.cpp 13871 2008-07-29 22:37:54Z rubidium $ */

#include "stdafx.h"

#include "openttd.h"

106

/* Else the cargo value is a 'climate independent' 'bitnum' */

107

if (HasBit(_cargo_mask, cargo)) return GetCargoIDByBitnum(cargo);

108

} else {

109

/* If the GRF contains a translation table (and the cargo is in bounds)

110

* then get the cargo ID for the label */

111

if (cargo < grffile->cargo_max) return GetCargoIDByLabel(grffile->cargo_list[cargo]);

109

/* If the GRF contains a translation table... */

110

if (grffile->cargo_max > 0) {

111

/* ...and the cargo is in bounds, then get the cargo ID for

112

* the label */

113

if (cargo < grffile->cargo_max) return GetCargoIDByLabel(grffile->cargo_list[cargo]);

114

} else {

115

/* Else the cargo value is a 'climate independent' 'bitnum' */

116

if (HasBit(_cargo_mask, cargo)) return GetCargoIDByBitnum(cargo);

117

}

112

118

}

113

119

return CT_INVALID;

114

120

}

Older »