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

[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:
1e363fae95 MM: MM1: Guard against invalid portraits when loading savegames


Commit: 1e363fae95a74730e3365bc17821bab17216a5e1
    https://github.com/scummvm/scummvm/commit/1e363fae95a74730e3365bc17821bab17216a5e1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-29T18:15:44-07:00

Commit Message:
MM: MM1: Guard against invalid portraits when loading savegames

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


diff --git a/engines/mm/mm1/data/character.cpp b/engines/mm/mm1/data/character.cpp
index 1d913c56f17..b59037f3d01 100644
--- a/engines/mm/mm1/data/character.cpp
+++ b/engines/mm/mm1/data/character.cpp
@@ -227,9 +227,15 @@ void Character::synchronize(Common::Serializer &s, int portraitNum) {
 	s.syncAsByte(_worthiness);
 	s.syncAsByte(_alignmentCtr);
 	s.syncBytes(_flags, 14);
+
 	s.syncAsByte(_portrait);
-	if (s.isLoading() && portraitNum != -1)
-		_portrait = portraitNum;
+	if (s.isLoading()) {
+		if (portraitNum != -1)
+			_portrait = portraitNum;
+		else if (portraitNum >= NUM_PORTRAITS)
+			// Ensure only valid portrait numbers are specified
+			_portrait = 0;
+	}
 
 	if (s.isLoading())
 		loadFaceSprites();