[Scummvm-git-logs] scummvm master -> 713d3813b487ff72044815fe844a66b15ed06950

[a-yyg]

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:
713d3813b4 SAGA2: Fix memory leaks in audio.cpp


Commit: 713d3813b487ff72044815fe844a66b15ed06950
    https://github.com/scummvm/scummvm/commit/713d3813b487ff72044815fe844a66b15ed06950
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-22T20:22:33+09:00

Commit Message:
SAGA2: Fix memory leaks in audio.cpp

Changed paths:
    engines/saga2/audio.cpp


diff --git a/engines/saga2/audio.cpp b/engines/saga2/audio.cpp
index ec60e4dec0..2ee9953a7d 100644
--- a/engines/saga2/audio.cpp
+++ b/engines/saga2/audio.cpp
@@ -138,6 +138,34 @@ void startAudio(void) {
 	clickData[2] = (uint8 *)LoadResource(soundRes, MKTAG('C', 'L', 'K', 2), "Click 2");
 }
 
+void cleanupAudio() {
+	if (g_vm->_audio) {
+		delete g_vm->_audio;
+		g_vm->_audio = nullptr;
+
+		free(clickData[1]);
+		clickData[1] = nullptr;
+
+		free(clickData[2]);
+		clickData[2] = nullptr;
+
+		delete musicRes;
+		musicRes = nullptr;
+
+		delete soundRes;
+		soundRes = nullptr;
+
+		delete longRes;
+		longRes = nullptr;
+
+		delete loopRes;
+		loopRes = nullptr;
+
+		delete voiceRes;
+		voiceRes = nullptr;
+	}
+}
+
 //-----------------------------------------------------------------------
 // audio event loop
 
@@ -547,10 +575,6 @@ bool initAudio() {
 	return true;
 }
 
-void cleanupAudio() {
-	delete g_vm->_audio;
-}
-
 AudioInterface::AudioInterface() {
 	_music = nullptr;
 	_mixer = g_system->getMixer();