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

[criezy]

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:
e4ce1f79a5 GLK: Fix use after free error


Commit: e4ce1f79a59d5e059143d34ea36e2e50ca2bb842
    https://github.com/scummvm/scummvm/commit/e4ce1f79a59d5e059143d34ea36e2e50ca2bb842
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-18T20:06:28+01:00

Commit Message:
GLK: Fix use after free error

The config is accessed from some window destructors (such as the
TextBufferWindow) to check is speeck is enabled and needs to be
stopped. So we need to delete the config after the windows.

Changed paths:
    engines/glk/glk.cpp


diff --git a/engines/glk/glk.cpp b/engines/glk/glk.cpp
index 48043b9a62..cb4a753e5f 100644
--- a/engines/glk/glk.cpp
+++ b/engines/glk/glk.cpp
@@ -66,7 +66,6 @@ GlkEngine::GlkEngine(OSystem *syst, const GlkGameDescription &gameDesc) :
 GlkEngine::~GlkEngine() {
 	delete _blorb;
 	delete _clipboard;
-	delete _conf;
 	delete _events;
 	delete _pcSpeaker;
 	delete _pictures;
@@ -75,6 +74,7 @@ GlkEngine::~GlkEngine() {
 	delete _sounds;
 	delete _streams;
 	delete _windows;
+	delete _conf;
 
 	// Remove all of our debug levels here
 	DebugMan.clearAllDebugChannels();