msadpm: Stop decoding instead of crashing for invalid adpcm data.

Apply the same patch from 72528be8 for adpcm data sent to mono destinations in addition to stereo destinations. Signed-off-by: Brandon Moore <moore.3071@osu.edu> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msadpm: Stop decoding instead of crashing for invalid adpcm data.
63f9a082 · Brandon Moore · Alexandre Julliard · 7a32bc9e · 63f9a082
Commit 63f9a082 authored Apr 29, 2022 by Brandon Moore Committed by Alexandre Julliard May 23, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

msadp32.c dlls/msadp32.acm/msadp32.c +8 -1

No files found.
--- a/dlls/msadp32.acm/msadp32.c
+++ b/dlls/msadp32.acm/msadp32.c
@@ -319,7 +319,14 @@ static	void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi,
    {
        const unsigned char*    in_src = src;
-        assert(*src <= 6);
+        /* Catch a problem from Lord of the Rings War of the Ring where it
+         * passes invalid data. */
+        if (*src > 6)
+        {
+                *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign;
+                WARN("Invalid ADPCM data, stopping conversion\n");
+                break;
+        }
        coeff = MSADPCM_CoeffSet[*src++];
        idelta =  R16(src);     src += 2;