From d82eccea2bf905cd51889954658f4e7f64876df8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 24 Jan 2014 17:36:47 +0100 Subject: [PATCH] avcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra() Prevents some overreads at the cost of 1 cpu cycle Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 86011d11e3..f574997687 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -489,8 +489,9 @@ static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, } block[j] = level; - if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF) + if (((int32_t)GET_CACHE(re, &s->gb)) <= (int32_t)0xBFFFFFFF || i >= 64) break; + UPDATE_CACHE(re, &s->gb); } end: