[Scummvm-git-logs] scummvm master -> 8308341a98991ff0809ee9b38121e3d4a73a39f3

dreammaster dreammaster at scummvm.org
Sat Aug 19 04:30:42 CEST 2017


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:
8308341a98 TITANIC: Fix use-after-free in TTtalker when loading savegames


Commit: 8308341a98991ff0809ee9b38121e3d4a73a39f3
    https://github.com/scummvm/scummvm/commit/8308341a98991ff0809ee9b38121e3d4a73a39f3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-18T22:30:38-04:00

Commit Message:
TITANIC: Fix use-after-free in TTtalker when loading savegames

Changed paths:
    engines/titanic/game_manager.cpp


diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index 13fe1d2..65a2a27 100644
--- a/engines/titanic/game_manager.cpp
+++ b/engines/titanic/game_manager.cpp
@@ -81,8 +81,8 @@ void CGameManager::preLoad() {
 	_timers.destroyContents();
 	_soundMaker = nullptr;
 
-	_trueTalkManager.preLoad();
 	_sound.preLoad();
+	_trueTalkManager.preLoad();
 }
 
 void CGameManager::postLoad(CProjectItem *project) {





More information about the Scummvm-git-logs mailing list