cpp/openttd-patchpack/source Changeset - r28474:67f4beeb903d

Changeset - r28474:67f4beeb903d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Rubidium - 11 months ago 2024-01-15 19:58:24
rubidium@openttd.org

Fix fbd71a9: for TTO savegames, getting the savegame type left the file pointing to the wrong location

1 file changed with 7 insertions and 4 deletions:

src/saveload/oldloader.cpp

0 comments (0 inline, 0 general)

src/saveload/oldloader.cpp

➞

Show inline comments

@@ @@ -222,22 +222,23 @@ static bool VerifyOldNameChecksum(char * @@
 	return sum == sum2;
+}
 static std::tuple<SavegameType, std::string> DetermineOldSavegameTypeAndName(FILE *f)
+{
 	long pos = ftell(f);
 	char buffer[std::max(TTO_HEADER_SIZE, TTD_HEADER_SIZE)];
 	if (fread(buffer, 1, lengthof(buffer), f) != lengthof(buffer)) {
+	if (pos < 0 || fread(buffer, 1, lengthof(buffer), f) != lengthof(buffer)) {
 		return { SGT_INVALID, "(broken) Unable to read file" };
+	}
 	if (VerifyOldNameChecksum(buffer, TTO_HEADER_SIZE)) {
+	if (VerifyOldNameChecksum(buffer, TTO_HEADER_SIZE) && fseek(f, pos + TTO_HEADER_SIZE, SEEK_SET) == 0) {
 		return { SGT_TTO, "(TTO)" + StrMakeValid({buffer, TTO_HEADER_SIZE - HEADER_CHECKSUM_SIZE}) };
+	}
 	if (VerifyOldNameChecksum(buffer, TTD_HEADER_SIZE)) {
+	if (VerifyOldNameChecksum(buffer, TTD_HEADER_SIZE) && fseek(f, pos + TTD_HEADER_SIZE, SEEK_SET) == 0) {
 		return { SGT_TTD, "(TTD)" + StrMakeValid({buffer, TTD_HEADER_SIZE - HEADER_CHECKSUM_SIZE}) };
+	}
 	return { SGT_INVALID, "(broken) Unknown" };
+}
@@ @@ -264,13 +265,15 @@ bool LoadOldSaveGame(const std::string & @@
 	LoadOldMainProc *proc = nullptr;
 	switch (type) {
 		case SGT_TTO: proc = &LoadTTOMain; break;
 		case SGT_TTD: proc = &LoadTTDMain; break;
 		default: break;
 		default:
 			Debug(oldloader, 0, "Unknown savegame type; cannot be loaded");
 			break;
+	}
 	_savegame_type = type;
 	bool game_loaded;
 	try {

0 comments (0 inline, 0 general)