cpp/openttd-patchpack/source Changeset - r17922:ab4cbf6c55fc

Changeset - r17922:ab4cbf6c55fc

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 13 years ago 2011-08-12 18:36:47
rubidium@openttd.org

(svn r22737) -Fix [FS#4717]: some corrupted savegames could crash OpenTTD instead of showing the "savegame corrupted" message

3 files changed with 8 insertions and 0 deletions:

src/saveload/cheat_sl.cpp

src/saveload/company_sl.cpp

src/saveload/strings_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/cheat_sl.cpp

➞

Show inline comments

@@ @@ -38,6 +38,8 @@ static void Load_CHTS() @@
+{
 	Cheat *cht = (Cheat*)&_cheats;
 	size_t count = SlGetFieldLength() / 2;
 	/* Cannot use lengthof because _cheats is of type Cheats, not Cheat */
 	if (count > sizeof(_cheats) / sizeof(Cheat)) SlErrorCorrupt("Too many cheat values");
 	for (uint i = 0; i < count; i++) {
 		cht[i].been_used = (SlReadByte() != 0);

src/saveload/company_sl.cpp

➞

Show inline comments

@@ @@ -283,6 +283,7 @@ static void SaveLoad_PLYR_common(Company @@
 	SlObject(&cprops->cur_economy, _company_economy_desc);
 	/* Write old economy entries. */
 	if (cprops->num_valid_stat_ent > lengthof(cprops->old_economy)) SlErrorCorrupt("Too many old economy entries");
 	for (i = 0; i < cprops->num_valid_stat_ent; i++) {
 		SlObject(&cprops->old_economy[i], _company_economy_desc);
+	}

src/saveload/strings_sl.cpp

➞

Show inline comments

@@ @@ -126,7 +126,12 @@ static void Load_NAME() @@
 	int index;
 	while ((index = SlIterateArray()) != -1) {
 		if (index >= NUM_OLD_STRINGS) SlErrorCorrupt("Invalid old name index");
 		if (SlGetFieldLength() > (uint)LEN_OLD_STRINGS) SlErrorCorrupt("Invalid old name length");
 		SlArray(&_old_name_array[LEN_OLD_STRINGS * index], SlGetFieldLength(), SLE_UINT8);
 		/* Make sure the old name is null terminated */
 		_old_name_array[LEN_OLD_STRINGS * index + LEN_OLD_STRINGS - 1] = '\0';
+	}
+}

0 comments (0 inline, 0 general)