Fix a buffer overflow in the mixer.

83178a1d · David Reid · 5dda38d4 · 83178a1d
Commit 83178a1d authored Jul 23, 2020 by David Reid
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

research/ma_mixing.h research/ma_mixing.h +5 -0

No files found.
--- a/research/ma_mixing.h
+++ b/research/ma_mixing.h
@@ -2369,6 +2369,11 @@ MA_API ma_result ma_mixer_begin(ma_mixer* pMixer, ma_mixer* pParentMixer, ma_uin
        }
    } else {
        frameCountIn = frameCountOut;
+
+        if (frameCountIn  > pMixer->accumulationBufferSizeInFrames) {
+            frameCountIn  = pMixer->accumulationBufferSizeInFrames;
+            frameCountOut = pMixer->accumulationBufferSizeInFrames;
+        }
    }

    /* If the output frame count cannot match the parent's input frame count we need to fail. */