virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

wma: don't return 0 on invalid packets.

Browse Source 
Return 0 means "please return the same data again", i.e. it causes an
infinite loop. Instead, return an error.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Ronald S. Bultje
2012-02-17 16:57:00 -08:00
parent 41afac7f7a
commit 9d3050d3e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/wmadec.c
View File

@@ -817,8 +817,12 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data,
s->last_superframe_len = 0;
return 0;
}
if (buf_size < s->block_align)
return 0;
if (buf_size < s->block_align) {
av_log(avctx, AV_LOG_ERROR,
"Input packet size too small (%d < %d)\n",
buf_size, s->block_align);
return AVERROR_INVALIDDATA;
}
buf_size = s->block_align;
init_get_bits(&s->gb, buf, buf_size*8);