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

sev- sev at scummvm.org
Mon Jul 6 11:44:11 UTC 2020


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:
f568483bbb DIRECTOR: Fix crash when cleaning up Lingo


Commit: f568483bbbe2bc062aa2aad2e6fbb9e5583b5c55
    https://github.com/scummvm/scummvm/commit/f568483bbbe2bc062aa2aad2e6fbb9e5583b5c55
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-06T13:43:32+02:00

Commit Message:
DIRECTOR: Fix crash when cleaning up Lingo

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 94606bc276..ab157d8708 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -99,6 +99,9 @@ Cast::~Cast() {
 
 	for (int i = 0; i <= kMaxScriptType; i++) {
 		for (ScriptContextHash::iterator it = _lingoArchive->scriptContexts[i].begin(); it != _lingoArchive->scriptContexts[i].end(); ++it) {
+			if (!it->_value)
+				continue;
+
 			it->_value->_eventHandlers.clear();
 			it->_value->_functionHandlers.clear();
 			delete it->_value;




More information about the Scummvm-git-logs mailing list