summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-06-29 09:05:30 +0000
committerbjarni <bjarni@openttd.org>2006-06-29 09:05:30 +0000
commit0df769f3edc4bb20fa6db8459b2f2f4033f98689 (patch)
tree791a52c058ca7197f0a27c4297ca1b2d522106b8
parent2e0498dce05b59a8e7a9e99d7508932a9227c993 (diff)
downloadopenttd-0df769f3edc4bb20fa6db8459b2f2f4033f98689.tar.xz
(svn r5428) -Fix: [vehicles] sovled crash when trying to build a vehicle type, that is set to max 0 (spotted by roboman)
somebody might add a better string than "too many vehicles in game" since none are allowed, but at least it will not crash anymore
-rw-r--r--vehicle.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/vehicle.c b/vehicle.c
index 163c66276..9674a2a99 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -2054,6 +2054,14 @@ UnitID GetFreeUnitNumber(byte type)
default: NOT_REACHED();
}
+ if (max == 0) {
+ /* we can't build any of this kind of vehicle, so we just return 1 instead of looking for a free number
+ * a max of 0 will cause the following code to write to a NULL pointer
+ * We know that 1 is bigger than the max allowed vehicle number, so it's the same as returning something, that is too big
+ */
+ return 1;
+ }
+
if (max > gmax) {
gmax = max;
free(cache);