[Scummvm-git-logs] scummvm master -> ef5f9d28d1e00247b40716cec3c2a140f72d949f

[bluegr]

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:
ef5f9d28d1 MOHAWK: LB: Fix crash in the v3 sampler during the Green Eggs and Ham section


Commit: ef5f9d28d1e00247b40716cec3c2a140f72d949f
    https://github.com/scummvm/scummvm/commit/ef5f9d28d1e00247b40716cec3c2a140f72d949f
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-01-04T22:22:11+02:00

Commit Message:
MOHAWK: LB: Fix crash in the v3 sampler during the Green Eggs and Ham section

Changed paths:
    engines/mohawk/livingbooks.cpp


diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 67284eea808..2ad4295d101 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -3215,7 +3215,11 @@ void LBGroupItem::readData(uint16 type, uint16 size, Common::MemoryReadStreamEnd
 			// TODO: is type important for any game? at the moment, we ignore it
 			entry.entryType = stream->readUint16();
 			entry.entryId = stream->readUint16();
-			_groupEntries.push_back(entry);
+			// HACK: The Living Books v3 sampler includes the ID for the group as
+			// one of the entries in the Green Eggs and Ham section, which leads
+			// to infinite recursion when the group is loaded.
+			if (entry.entryId != getId())
+				_groupEntries.push_back(entry);
 			debug(3, "group entry: id %d, type %d", entry.entryId, entry.entryType);
 		}
 		}