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

sev- sev at scummvm.org
Sun May 2 23:05:44 UTC 2021


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:
a4be414fec SLUDGE: Fix use-after-free on engine quit


Commit: a4be414fecb0e0dfd71adaf32f4b75cabfe47066
    https://github.com/scummvm/scummvm/commit/a4be414fecb0e0dfd71adaf32f4b75cabfe47066
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-03T01:05:12+02:00

Commit Message:
SLUDGE: Fix use-after-free on engine quit

Changed paths:
    engines/sludge/sludger.cpp


diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp
index f9dedf22fc..4a88b51f70 100644
--- a/engines/sludge/sludger.cpp
+++ b/engines/sludge/sludger.cpp
@@ -155,10 +155,10 @@ void initSludge() {
 
 void killSludge() {
 	killAllFunctions();
+	g_sludge->_speechMan->kill();
 	g_sludge->_peopleMan->kill();
 	g_sludge->_regionMan->kill();
 	g_sludge->_floorMan->kill();
-	g_sludge->_speechMan->kill();
 	g_sludge->_languageMan->kill();
 	g_sludge->_gfxMan->kill();
 	g_sludge->_resMan->kill();




More information about the Scummvm-git-logs mailing list