har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Laurent Aimar 2011-09-07 21:43:03 +02:00 committed by Martin Storsjö
parent 6a11686dfc
commit 8bfea4ab4e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wavpack.c
View File

@ -863,12 +863,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
} }
switch(id & WP_IDF_MASK){ switch(id & WP_IDF_MASK){
case WP_ID_DECTERMS: case WP_ID_DECTERMS:
s->terms = size; if(size > MAX_TERMS){
if(s->terms > MAX_TERMS){
av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n"); av_log(avctx, AV_LOG_ERROR, "Too many decorrelation terms\n");
s->terms = 0;
buf += ssize; buf += ssize;
continue; continue;
} }
s->terms = size;
for(i = 0; i < s->terms; i++) { for(i = 0; i < s->terms; i++) {
s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5; s->decorr[s->terms - i - 1].value = (*buf & 0x1F) - 5;
s->decorr[s->terms - i - 1].delta = *buf >> 5; s->decorr[s->terms - i - 1].delta = *buf >> 5;