From 81074e0ca2b8c7fa470db5b657998ac614a810de Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 12 Aug 2011 18:36:47 +0000 Subject: (svn r22737) -Fix [FS#4717]: some corrupted savegames could crash OpenTTD instead of showing the "savegame corrupted" message --- src/saveload/strings_sl.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/saveload/strings_sl.cpp') diff --git a/src/saveload/strings_sl.cpp b/src/saveload/strings_sl.cpp index 6869a1af6..00180978b 100644 --- a/src/saveload/strings_sl.cpp +++ b/src/saveload/strings_sl.cpp @@ -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'; } } -- cgit v1.2.3-70-g09d2