[Scummvm-git-logs] scummvm master -> 7e13add45265683a9444fae0a812a5628e537b6a

djsrv dservilla at gmail.com
Wed Jul 28 03:51:15 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:
7e13add452 DIRECTOR: Fix memory leaks


Commit: 7e13add45265683a9444fae0a812a5628e537b6a
    https://github.com/scummvm/scummvm/commit/7e13add45265683a9444fae0a812a5628e537b6a
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-27T23:50:44-04:00

Commit Message:
DIRECTOR: Fix memory leaks

Changed paths:
    engines/director/archive.cpp
    engines/director/sound.cpp
    engines/director/window.cpp


diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 9a9fc9809e..09794a7e88 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -289,7 +289,7 @@ Common::SeekableReadStreamEndian *MacArchive::getResource(uint32 tag, uint16 id)
 		return nullptr;
 	}
 
-	return new Common::SeekableSubReadStreamEndian(stream, 0, stream->size(), true, DisposeAfterUse::NO);
+	return new Common::SeekableSubReadStreamEndian(stream, 0, stream->size(), true, DisposeAfterUse::YES);
 }
 
 // RIFF Archive code
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 816e29255c..9a50dbd5c5 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -312,6 +312,8 @@ void DirectorSound::loadSampleSounds(uint type) {
 		ad->loadExternalSoundStream(*csndData);
 		_sampleSounds[type].push_back(ad);
 	}
+
+	delete csndData;
 }
 
 void DirectorSound::unloadSampleSounds() {
diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index 22181a9ecd..91d5d7b41f 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -72,6 +72,7 @@ Window::Window(int id, bool scrollable, bool resizable, bool editable, Graphics:
 }
 
 Window::~Window() {
+	delete _soundManager;
 	delete _currentMovie;
 	if (_macBinary) {
 		delete _macBinary;




More information about the Scummvm-git-logs mailing list