From ea7ccf3748452b614b6ae81fa814303a49733fc2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 20 Feb 2014 05:48:54 +0100 Subject: [PATCH] avcodec/mpeg4videodec: Check for bitstream overread in decode_vol_header() Fixes out of array read Fixes: 08e48e9daae7d8f8ab6dbe3919e797e5-asan_heap-oob_157461c_5295_cov_1266798650_firefing.mpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer (cherry picked from commit 3edc3b159503d512c919b3d5902f7026e961823a) Conflicts: libavcodec/mpeg4videodec.c --- libavcodec/mpeg4videodec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index dd97bd791b..7a4a441100 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1766,6 +1766,11 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){ s->quarter_sample= get_bits1(gb); else s->quarter_sample=0; + if (get_bits_left(gb) < 4) { + av_log(s->avctx, AV_LOG_ERROR, "VOL Header truncated\n"); + return AVERROR_INVALIDDATA; + } + if(!get_bits1(gb)){ int pos= get_bits_count(gb); int estimation_method= get_bits(gb, 2);