[Scummvm-git-logs] scummvm master -> 6da669db9a36296abf4e6cbdbb67aad6752d95d0

AndywinXp noreply at scummvm.org
Sun Dec 1 16:53:59 UTC 2024


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:
6da669db9a SCUMM: HE: Fix mem leak in mixer_he


Commit: 6da669db9a36296abf4e6cbdbb67aad6752d95d0
    https://github.com/scummvm/scummvm/commit/6da669db9a36296abf4e6cbdbb67aad6752d95d0
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-12-01T17:53:53+01:00

Commit Message:
SCUMM: HE: Fix mem leak in mixer_he

@tunnelsociety "HEMixerChannel.residualData could
be allocated but not used and freed"

Changed paths:
    engines/scumm/he/mixer_he.cpp


diff --git a/engines/scumm/he/mixer_he.cpp b/engines/scumm/he/mixer_he.cpp
index ebfd59913e1..668c9709e5e 100644
--- a/engines/scumm/he/mixer_he.cpp
+++ b/engines/scumm/he/mixer_he.cpp
@@ -541,7 +541,7 @@ bool HEMixer::mixerStartChannel(
 	}
 
 	bool hasCallbackData = false;
-	if (flags & CHANNEL_CALLBACK_EARLY) {
+	if ((flags & CHANNEL_CALLBACK_EARLY) && !(_mixerChannels[channel].flags & CHANNEL_LOOPING)) {
 		va_start(params, flags);
 		_mixerChannels[channel].endSampleAdjustment = va_arg(params, int);
 		va_end(params);




More information about the Scummvm-git-logs mailing list