diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 05:48:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 05:49:52 +0100 |
| commit | 3edc3b159503d512c919b3d5902f7026e961823a (patch) | |
| tree | be81cfa0fe7dccc36effe0b00c01e3c308254f40 | |
| parent | 916a79227e0dbeb8c1a2b7285b959729fa53e470 (diff) | |
| download | ffmpeg-3edc3b159503d512c919b3d5902f7026e961823a.tar.gz | |
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 <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 22e706ebd7..a1f530c3bc 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1916,6 +1916,11 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *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); |