[Scummvm-git-logs] scummvm master -> 1ae8852549f1cc54ed7aa11605220053c31f757a

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ae8852549 MM: MM1: Fix crash on roster load


Commit: 1ae8852549f1cc54ed7aa11605220053c31f757a
    https://github.com/scummvm/scummvm/commit/1ae8852549f1cc54ed7aa11605220053c31f757a
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-06-12T07:45:44-07:00

Commit Message:
MM: MM1: Fix crash on roster load

Do not ignore EOS when loading roster save.
This prevents a comparison with an uninitialized variable.

Fixes #14509

Changed paths:
    engines/mm/mm1/data/roster.cpp


diff --git a/engines/mm/mm1/data/roster.cpp b/engines/mm/mm1/data/roster.cpp
index fac87f97193..8f58d04f342 100644
--- a/engines/mm/mm1/data/roster.cpp
+++ b/engines/mm/mm1/data/roster.cpp
@@ -51,7 +51,7 @@ void Roster::load() {
 
 		while (!sf->eos()) {
 			uint32 chunk = sf->readUint32BE();
-			if (chunk == MKTAG('M', 'A', 'P', 'S')) {
+			if (!sf->eos() && chunk == MKTAG('M', 'A', 'P', 'S')) {
 				sf->skip(4);	// Skip chunk size
 				g_maps->synchronize(s);
 			}