[Scummvm-git-logs] scummvm master -> 69c367ebb854bcf45491f2da83c349996d8d4992

[rvanlaar]

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:
69c367ebb8 DIRECTOR: LINGO: XplayAnim: thread safety


Commit: 69c367ebb854bcf45491f2da83c349996d8d4992
    https://github.com/scummvm/scummvm/commit/69c367ebb854bcf45491f2da83c349996d8d4992
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-03-01T21:14:32+01:00

Commit Message:
DIRECTOR: LINGO: XplayAnim: thread safety

Make Palette restore thread save by copying the palette.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index d4a9cca2240..b3f1ebc049b 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2708,8 +2708,9 @@ void LB::b_xPlayAnim(int nargs){
 	video->loadFile(Common::Path(filename, g_director->_dirSeparator));
 
 	// save the current palette
-	byte *origPalette = const_cast<byte *>(g_director->getPalette());
+	byte origPalette[256 * 3];
 	uint16 origCount = g_director->getPaletteColorCount();
+	memcpy(origPalette, g_director->getPalette(), origCount * 3);
 
 	Common::Event event;
 	video->start();