[Scummvm-git-logs] scummvm master -> 5c230256c6153cd9a69d4808b5a50ac54dc66edf

[djsrv]

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:
5c230256c6 DIRECTOR: LINGO: Fix segfault


Commit: 5c230256c6153cd9a69d4808b5a50ac54dc66edf
    https://github.com/scummvm/scummvm/commit/5c230256c6153cd9a69d4808b5a50ac54dc66edf
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-14T13:10:52-04:00

Commit Message:
DIRECTOR: LINGO: Fix segfault

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


diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index d5ce2f6efe..a79a74f0d3 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -914,14 +914,13 @@ ScriptContext *Lingo::compileLingoV4(Common::SeekableSubReadStreamEndian &stream
 		}
 		debugC(1, kDebugCompile, "Add V4 script %d: factory '%s'", lctxIndex, factoryName.c_str());
 
-		sc = new ScriptContext(factoryName, _assemblyArchive, scriptType, castId);
+		sc = _assemblyContext = new ScriptContext(factoryName, _assemblyArchive, scriptType, castId);
 		codeFactory(factoryName);
 	} else {
 		debugC(1, kDebugCompile, "Add V4 script %d: maybe %s %d", lctxIndex, scriptType2str(scriptType), castId);
 
-		sc = new ScriptContext(!castName.empty() ? castName : Common::String::format("%d", castId), _assemblyArchive, scriptType, castId);
+		sc = _assemblyContext = new ScriptContext(!castName.empty() ? castName : Common::String::format("%d", castId), _assemblyArchive, scriptType, castId);
 	}
-	_assemblyContext = sc;
 
 	// initialise each property
 	if ((uint32)stream.size() < propertiesOffset + propertiesCount * 2) {