openttd-mini: comparison src/newgrf.cpp

equal deleted inserted replaced

-:dce11622ab6a
+:6a0c2739e124
 	va_end(va);
 	DEBUG(grf, severity, "[%s:%d] %s", _cur_grfconfig->filename, _nfo_line, buf);
 }
-static inline void check_length(int real, int wanted, const char *str)
+static inline bool check_length(int real, int wanted, const char *str)
 {
-	if (real >= wanted) return;
+	if (real >= wanted) return true;
 	grfmsg(0, "%s: Invalid pseudo sprite length %d (expected %d)!", str, real, wanted);
+	return false;
 }
 static inline byte grf_load_byte(byte **buf)
 {
 	return *(*buf)++;
 	if (len == 1) {
 		grfmsg(8, "Silently ignoring one-byte special sprite 0x00");
 		return;
 	}
-	check_length(len, 6, "FeatureChangeInfo");
+	if (!check_length(len, 6, "FeatureChangeInfo")) return;
 	buf++;
 	feature  = grf_load_byte(&buf);
 	numprops = grf_load_byte(&buf);
 	numinfo  = grf_load_byte(&buf);
 	engine   = grf_load_byte(&buf);
 	uint8 feature;
 	uint8 numprops;
 	uint8 numinfo;
 	uint8 index;
-	check_length(len, 6, "SafeChangeInfo");
+	if (!check_length(len, 6, "SafeChangeInfo")) return;
 	buf++;
 	feature  = grf_load_byte(&buf);
 	numprops = grf_load_byte(&buf);
 	numinfo  = grf_load_byte(&buf);
 	index    = grf_load_byte(&buf);
 	uint8 feature;
 	uint num_sets;
 	uint num_ents;
 	uint i;
-	check_length(len, 4, "NewSpriteSet");
+	if (!check_length(len, 4, "NewSpriteSet")) return;
 	buf++;
 	feature  = grf_load_byte(&buf);
 	num_sets = grf_load_byte(&buf);
 	num_ents = grf_load_extended(&buf);
 	uint8 setid;
 	uint8 type;
 	SpriteGroup *group = NULL;
 	byte *bufend = buf + len;
-	check_length(len, 5, "NewSpriteGroup");
+	if (!check_length(len, 5, "NewSpriteGroup")) return;
 	buf++;
 	feature = grf_load_byte(&buf);
 	setid   = grf_load_byte(&buf);
 	type    = grf_load_byte(&buf);
 			byte varadjust;
 			byte varsize;
 			uint i;
 			/* Check we can load the var size parameter */
-			check_length(bufend - buf, 1, "NewSpriteGroup (Deterministic) (1)");
+			if (!check_length(bufend - buf, 1, "NewSpriteGroup (Deterministic) (1)")) return;
 			group = AllocateSpriteGroup();
 			group->type = SGT_DETERMINISTIC;
 			group->g.determ.var_scope = HASBIT(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 				case 0: group->g.determ.size = DSG_SIZE_BYTE;  varsize = 1; break;
 				case 1: group->g.determ.size = DSG_SIZE_WORD;  varsize = 2; break;
 				case 2: group->g.determ.size = DSG_SIZE_DWORD; varsize = 4; break;
 			}
-			check_length(bufend - buf, 5 + varsize, "NewSpriteGroup (Deterministic) (2)");
+			if (!check_length(bufend - buf, 5 + varsize, "NewSpriteGroup (Deterministic) (2)")) return;
 			/* Loop through the var adjusts. Unfortunately we don't know how many we have
 			 * from the outset, so we shall have to keep reallocing. */
 			do {
 				DeterministicSpriteGroupAdjust *adjust;
 				if (group->g.determ.num_adjusts > 0) {
-					check_length(bufend - buf, 2 + varsize + 3, "NewSpriteGroup (Deterministic) (3)");
+					if (!check_length(bufend - buf, 2 + varsize + 3, "NewSpriteGroup (Deterministic) (3)")) return;
 				}
 				group->g.determ.num_adjusts++;
 				ReallocT(&group->g.determ.adjusts, group->g.determ.num_adjusts);
 			} while (HASBIT(varadjust, 5));
 			group->g.determ.num_ranges = grf_load_byte(&buf);
 			CallocT(&group->g.determ.ranges, group->g.determ.num_ranges);
-			check_length(bufend - buf, 2 + (2 + 2 * varsize) * group->g.determ.num_ranges, "NewSpriteGroup (Deterministic)");
+			if (!check_length(bufend - buf, 2 + (2 + 2 * varsize) * group->g.determ.num_ranges, "NewSpriteGroup (Deterministic)")) return;
 			for (i = 0; i < group->g.determ.num_ranges; i++) {
 				group->g.determ.ranges[i].group = GetGroupFromGroupID(setid, type, grf_load_word(&buf));
 				group->g.determ.ranges[i].low   = grf_load_var(varsize, &buf);
 				group->g.determ.ranges[i].high  = grf_load_var(varsize, &buf);
 		case 0x83: // Parent scope
 		{
 			byte triggers;
 			uint i;
-			check_length(bufend - buf, 7, "NewSpriteGroup (Randomized) (1)");
+			if (!check_length(bufend - buf, 7, "NewSpriteGroup (Randomized) (1)")) return;
 			group = AllocateSpriteGroup();
 			group->type = SGT_RANDOMIZED;
 			group->g.random.var_scope = HASBIT(type, 1) ? VSG_SCOPE_PARENT : VSG_SCOPE_SELF;
 			group->g.random.cmp_mode       = HASBIT(triggers, 7) ? RSG_CMP_ALL : RSG_CMP_ANY;
 			group->g.random.lowest_randbit = grf_load_byte(&buf);
 			group->g.random.num_groups     = grf_load_byte(&buf);
 			CallocT(&group->g.random.groups, group->g.random.num_groups);
-			check_length(bufend - buf, 2 * group->g.random.num_groups, "NewSpriteGroup (Randomized) (2)");
+			if (!check_length(bufend - buf, 2 * group->g.random.num_groups, "NewSpriteGroup (Randomized) (2)")) return;
 			for (i = 0; i < group->g.random.num_groups; i++) {
 				group->g.random.groups[i] = GetGroupFromGroupID(setid, type, grf_load_word(&buf));
 			}
 					if (_cur_grffile->spriteset_start == 0) {
 						grfmsg(0, "NewSpriteGroup: No sprite set to work on! Skipping");
 						return;
 					}
-					check_length(bufend - buf, 2 * num_loaded + 2 * num_loading, "NewSpriteGroup (Real) (1)");
+					if (!check_length(bufend - buf, 2 * num_loaded + 2 * num_loading, "NewSpriteGroup (Real) (1)")) return;
 					group = AllocateSpriteGroup();
 					group->type = SGT_REAL;
 					group->g.real.num_loaded  = num_loaded;
 	uint8 idcount;
 	bool wagover;
 	uint8 cidcount;
 	int c, i;
-	check_length(len, 6, "FeatureMapSpriteGroup");
+	if (!check_length(len, 6, "FeatureMapSpriteGroup")) return;
 	feature = buf[1];
 	idcount = buf[2] & 0x7F;
 	wagover = (buf[2] & 0x80) == 0x80;
-	check_length(len, 3 + idcount, "FeatureMapSpriteGroup");
+	if (!check_length(len, 3 + idcount, "FeatureMapSpriteGroup")) return;
 	/* If ``n-id'' (or ``idcount'') is zero, this is a ``feature
 	 * callback''. */
 	if (idcount == 0) {
 		grfmsg(2, "FeatureMapSpriteGroup: Feature callbacks not implemented yet");
 		return;
 	}
 	cidcount = buf[3 + idcount];
-	check_length(len, 4 + idcount + cidcount * 3, "FeatureMapSpriteGroup");
+	if (!check_length(len, 4 + idcount + cidcount * 3, "FeatureMapSpriteGroup")) return;
 	grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids, %d cids, wagon override %d",
 			feature, idcount, cidcount, wagover);
 	if (feature > GSF_STATION) {
 	uint16 endid;
 	const char* name;
 	bool new_scheme = _cur_grffile->grf_version >= 7;
 	bool generic;
-	check_length(len, 6, "FeatureNewName");
+	if (!check_length(len, 6, "FeatureNewName")) return;
 	buf++;
 	feature  = grf_load_byte(&buf);
 	lang     = grf_load_byte(&buf);
 	num      = grf_load_byte(&buf);
 	generic  = HASBIT(lang, 7);
 	uint8 type;
 	uint16 num;
 	SpriteID replace = 0;
-	check_length(len, 2, "GraphicsNew");
+	if (!check_length(len, 2, "GraphicsNew")) return;
 	buf++;
 	type = grf_load_byte(&buf);
 	num  = grf_load_extended(&buf);
 	switch (type) {
 	uint32 mask = 0;
 	bool result;
 	GRFLabel *label;
 	GRFLabel *choice = NULL;
-	check_length(len, 6, "SkipIf");
+	if (!check_length(len, 6, "SkipIf")) return;
 	buf++;
 	param     = grf_load_byte(&buf);
 	paramsize = grf_load_byte(&buf);
 	condtype  = grf_load_byte(&buf);
 	const char *name;
 	const char *info;
 	int name_len;
 	int info_len;
-	check_length(len, 8, "Info"); buf++;
+	if (!check_length(len, 8, "Info")) return; buf++;
 	version = grf_load_byte(&buf);
 	grfid = grf_load_dword(&buf);
 	_cur_grfconfig->grfid = grfid;
 	/* TODO: Check version. (We should have own versioning done somehow.) */
 	uint8 version;
 	uint32 grfid;
 	const char *name;
-	check_length(len, 8, "GRFInfo"); buf++;
+	if (!check_length(len, 8, "GRFInfo")) return; buf++;
 	version = grf_load_byte(&buf);
 	grfid = grf_load_dword(&buf);
 	name = (const char*)buf;
 	_cur_grffile->grfid = grfid;
 		"Fatal: ",
 	};
 	uint8 sevid;
 	uint8 msgid;
-	check_length(len, 6, "GRFError");
+	if (!check_length(len, 6, "GRFError")) return;
 	sevid = buf[1];
 	msgid = buf[3];
 	// Undocumented TTDPatch feature.
 	if (!HASBIT(sevid, 7) && _cur_stage < GLS_ACTIVATION) {
 /* Action 0x0D (GLS_SAFETYSCAN) */
 static void SafeParamSet(byte *buf, int len)
 {
 	uint8 target;
-	check_length(len, 5, "SafeParamSet");
+	if (!check_length(len, 5, "SafeParamSet")) return;
 	buf++;
 	target = grf_load_byte(&buf);
 	/* Only writing GRF parameters is considered safe */
 	if (target < 0x80) return;
 	uint32 src1;
 	uint32 src2;
 	uint32 data = 0;
 	uint32 res;
-	check_length(len, 5, "ParamSet");
+	if (!check_length(len, 5, "ParamSet")) return;
 	buf++;
 	target = grf_load_byte(&buf);
 	oper = grf_load_byte(&buf);
 	src1 = grf_load_byte(&buf);
 	src2 = grf_load_byte(&buf);
 	 * D grfids        GRFIDs of the files to deactivate */
 	byte num;
 	int i;
-	check_length(len, 1, "GRFInhibit");
+	if (!check_length(len, 1, "GRFInhibit")) return;
 	buf++, len--;
 	num = grf_load_byte(&buf); len--;
-	check_length(len, 4 * num, "GRFInhibit");
+	if (!check_length(len, 4 * num, "GRFInhibit")) return;
 	for (i = 0; i < num; i++) {
 		uint32 grfid = grf_load_dword(&buf);
 		/* GRF is unsafe it if tries to deactivate other GRFs */
 	 * D grfids        GRFIDs of the files to deactivate */
 	byte num;
 	int i;
-	check_length(len, 1, "GRFInhibit");
+	if (!check_length(len, 1, "GRFInhibit")) return;
 	buf++, len--;
 	num = grf_load_byte(&buf); len--;
-	check_length(len, 4 * num, "GRFInhibit");
+	if (!check_length(len, 4 * num, "GRFInhibit")) return;
 	for (i = 0; i < num; i++) {
 		uint32 grfid = grf_load_dword(&buf);
 		GRFConfig *file = GetGRFConfig(grfid);
 	 * B label      The label to define
 	 * V comment    Optional comment - ignored */
 	GRFLabel *label;
-	check_length(len, 1, "DefineGotoLabel");
+	if (!check_length(len, 1, "DefineGotoLabel")) return;
 	buf++; len--;
 	MallocT(&label, 1);
 	label->label    = grf_load_byte(&buf);
 	label->nfo_line = _nfo_line;
 	 *
 	 * W num      Number of sound files that follow */
 	uint16 num;
-	check_length(len, 1, "GRFSound");
+	if (!check_length(len, 1, "GRFSound")) return;
 	buf++;
 	num = grf_load_word(&buf);
 	_grf_data_blocks = num;
 	_grf_data_type   = GDT_SOUND;
 	uint8 num_def;
 	uint i;
 	buf++; len--;
-	check_length(len, 1, "LoadFontGlyph");
+	if (!check_length(len, 1, "LoadFontGlyph")) return;
 	num_def = grf_load_byte(&buf);
-	check_length(len, 1 + num_def * 4, "LoadFontGlyph");
+	if (!check_length(len, 1 + num_def * 4, "LoadFontGlyph")) return;
 	for (i = 0; i < num_def; i++) {
 		FontSize size    = (FontSize)grf_load_byte(&buf);
 		uint8  num_char  = grf_load_byte(&buf);
 		uint16 base_char = grf_load_word(&buf);

changeset 5590	6a0c2739e124
parent 5587	167d9a91ef02
child 5593	1921f3ef576a