From: Federico Tomassetti <[email protected]>
Bug-Id: CID 1257500
CC: [email protected]
---
libavcodec/eamad.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index a226a83..6103c0d 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -145,6 +145,10 @@ static inline void 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;
+ }
j = scantable[i];
level = (level*quant_matrix[j]) >> 4;
level = (level-1)|1;
@@ -159,6 +163,10 @@ static inline void 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;
+ }
j = scantable[i];
if (level < 0) {
level = -level;
@@ -170,10 +178,6 @@ static inline void 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;
- }
block[j] = level;
}
--
2.2.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
