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

rsn8887 noreply at scummvm.org
Tue May 3 16:23:54 UTC 2022


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:
e116a0abb0 SCUMM: Fix file handle leak during dialogs in FT


Commit: e116a0abb0ff7d806ac4c785ffb953bcce95448d
    https://github.com/scummvm/scummvm/commit/e116a0abb0ff7d806ac4c785ffb953bcce95448d
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2022-05-03T11:23:50-05:00

Commit Message:
SCUMM: Fix file handle leak during dialogs in FT

Changed paths:
    engines/scumm/imuse_digi/dimuse_files.cpp


diff --git a/engines/scumm/imuse_digi/dimuse_files.cpp b/engines/scumm/imuse_digi/dimuse_files.cpp
index 37a76270393..0a36a39dc08 100644
--- a/engines/scumm/imuse_digi/dimuse_files.cpp
+++ b/engines/scumm/imuse_digi/dimuse_files.cpp
@@ -47,8 +47,7 @@ IMuseDigiFilesHandler::IMuseDigiFilesHandler(IMuseDigital *engine, ScummEngine_v
 }
 
 IMuseDigiFilesHandler::~IMuseDigiFilesHandler() {
-	if (_ftSpeechFile)
-		_ftSpeechFile->close();
+	delete _ftSpeechFile;
 	delete _sound;
 }
 
@@ -426,6 +425,7 @@ int IMuseDigiFilesHandler::setCurrentSpeechFilename(const char *fileName) {
 
 void IMuseDigiFilesHandler::setCurrentFtSpeechFile(const char *fileName, ScummFile *file, uint32 offset, uint32 size) {
 	Common::strlcpy(_ftSpeechFilename, fileName, sizeof(_ftSpeechFilename));
+	delete _ftSpeechFile;
 	_ftSpeechFile = file;
 	_ftSpeechSubFileOffset = offset;
 	_ftSpeechFileSize = size;




More information about the Scummvm-git-logs mailing list