ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Tue Oct
28 15:26:42 2014 +0100| [d59804bafbaf8ce4bb194f04a4692271a8f8f875] | committer:
Michael Niedermayer
avcodec/dxa: check dimensions
Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)
Conflicts:
libavcodec/dxa.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d59804bafbaf8ce4bb194f04a4692271a8f8f875
---
libavcodec/dxa.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 7bd74f3..52a0fef 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -308,6 +308,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ if (avctx->width%4 || avctx->height%4) {
+ av_log(avctx, AV_LOG_ERROR, "dimensions are not a multiple of 4");
+ return AVERROR_INVALIDDATA;
+ }
+
avcodec_get_frame_defaults(&c->pic);
avcodec_get_frame_defaults(&c->prev);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
