diff options
| author | Federico Tomassetti <ftomassetti@groupon.com> | 2015-02-18 12:11:44 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 01:52:52 +0100 |
| commit | 2684ff3573a68037aa298bedd93b00a126c48a30 (patch) | |
| tree | 2da1b920b7707f65986ca13a2f113906eb6d4183 | |
| parent | ea0f616a57b0ce04d2eb94e92abdad77e0c8ee57 (diff) | |
| download | ffmpeg-2684ff3573a68037aa298bedd93b00a126c48a30.tar.gz | |
eamad: check for out of bounds read
Bug-Id: CID 1257500
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 061c489895d29049a88dc6118e4b639a273b31d6)
Conflicts:
libavcodec/eamad.c
| -rw-r--r-- | libavcodec/eamad.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 813a2d1cdb..6b7134a98d 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -151,6 +151,11 @@ static inline int decode_block_intra(MadContext *s, int16_t * block) break; } else if (level != 0) { i += run; + if (i > 63) { + av_log(s->avctx, AV_LOG_ERROR, + "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); + return -1; + } j = scantable[i]; level = (level*quant_matrix[j]) >> 4; level = (level-1)|1; @@ -165,6 +170,11 @@ static inline int decode_block_intra(MadContext *s, int16_t * block) run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); i += run; + if (i > 63) { + av_log(s->avctx, AV_LOG_ERROR, + "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); + return -1; + } j = scantable[i]; if (level < 0) { level = -level; @@ -176,10 +186,6 @@ static inline int decode_block_intra(MadContext *s, int16_t * block) level = (level-1)|1; } } - if (i > 63) { - av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); - return -1; - } block[j] = level; } |