system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 01:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msadpcm32.acm: Stop converting data instead of crashing.

Browse source 
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
This commit is contained in:
Bruno Jesus 2015-09-29 22:06:21 +08:00 committed by Alexandre Julliard
parent 972a74ddfe
commit 72528be84f
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/msadp32.acm/msadp32.c
View file

@ -249,9 +249,17 @@ static void cvtSSms16K(const ACMDRVSTREAMINSTANCE *adsi,
{
const unsigned char* in_src = src;
assert(*src <= 6);
/* Catch a problem from Tomb Raider III (bug 21000) where it passes
* invalid data after a valid sequence of blocks */
if (*src > 6 || *(src + 1) > 6)
{
/* Recalculate the amount of used output buffer. We are not changing
* nsrc, let's assume the bad data was parsed */
*ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign;
WARN("Invalid ADPCM data, stopping conversion\n");
break;
}
coeffL = MSADPCM_CoeffSet[*src++];
assert(*src <= 6);
coeffR = MSADPCM_CoeffSet[*src++];
ideltaL = R16(src); src += 2;