Mercurial > hg > openttd

changeset 12921:b652c0d78429 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17413) -Fix: assert when trying to build an invalid industry type it did
author rubidium <rubidium@openttd.org>
date Fri, 04 Sep 2009 20:02:35 +0000
parents 0cde81b7efca
children c71396273d66
files src/industry_cmd.cpp
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1678,7 +1678,10 @@
  */
 CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	const IndustrySpec *indspec = GetIndustrySpec(GB(p1, 0, 16));
+	IndustryType it = GB(p1, 0, 16);
+	if (it >= NUM_INDUSTRYTYPES) return CMD_ERROR;
+
+	const IndustrySpec *indspec = GetIndustrySpec(it);
 	const Industry *ind = NULL;
 
 	/* Check if the to-be built/founded industry is available for this climate. */
@@ -1717,7 +1720,8 @@
 	} else {
 		int count = indspec->num_table;
 		const IndustryTileTable * const *itt = indspec->table;
-		int num = Clamp(GB(p1, 16, 16), 0, count - 1);
+		int num = GB(p1, 16, 16);
+		if (num >= count) return CMD_ERROR;
 
 		_error_message = STR_ERROR_SITE_UNSUITABLE;
 		do {