(svn r22958) -Fix [FS#4778]: the savegame description and loading of savegames would crash with savegames from a patched stable (which didn't bump the savegame version)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index c0b48c6ba..512c3b4c5 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -205,6 +205,10 @@ static void Load_TOWN()
 	while ((index = SlIterateArray()) != -1) {
 		Town *t = new (index) Town();
 		SlObject(t, _town_desc);
+
+		if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST)) {
+			SlErrorCorrupt("Invalid town name generator");
+		}
 	}
 }