aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2012-01-27 14:24:07 -0800
committerAlex Converse <alex.converse@gmail.com>2012-01-30 10:54:24 -0800
commit48f1e5212c90b511c90fa0449655abb06a9edda2 (patch)
tree747c69f139a056262020bca703ced7666934befb
parentae35210a5d201e5ca7da83f46226681ceb3d5ad9 (diff)
downloadffmpeg-48f1e5212c90b511c90fa0449655abb06a9edda2.tar.gz
wmadec: Verify bitstream size makes sense before calling init_get_bits.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
-rw-r--r--libavcodec/wmadec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 5600f9ba90..41b2a8e7a7 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -873,6 +873,8 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data,
/* read each frame starting from bit_offset */
pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3;
+ if (pos >= MAX_CODED_SUPERFRAME_SIZE * 8)
+ return AVERROR_INVALIDDATA;
init_get_bits(&s->gb, buf + (pos >> 3), (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3))*8);
len = pos & 7;
if (len > 0)