RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

qdm2: check that coding_method is valid before using it. 

Fixes out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-09 13:13:50 +01:00
parent 909a18f73b
commit 5ee008e01d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/qdm2.c
View File

@ -795,6 +795,11 @@ static int synthfilt_build_sb_samples (QDM2Context *q, GetBitContext *gb, int le
for (j = 0; j < 16; j++)
sign_bits[j] = get_bits1 (gb);
if (q->coding_method[0][sb][0] <= 0) {
av_log(NULL, AV_LOG_ERROR, "coding method invalid\n");
return AVERROR_INVALIDDATA;
}
for (j = 0; j < 64; j++)
if (q->coding_method[1][sb][j] > q->coding_method[0][sb][j])
q->coding_method[0][sb][j] = q->coding_method[1][sb][j];