summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-10-28 15:26:42 +0100
committerMichael Niedermayer <[email protected]>2014-11-02 11:14:25 +0100
commitd59804bafbaf8ce4bb194f04a4692271a8f8f875 (patch)
treedf1487cf07bf54c611e2963ef6d9e0edc93eb00d
parent35cf24eee996c6233dde42e93e2a0ff6049f604b (diff)
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 <[email protected]> (cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90) Conflicts: libavcodec/dxa.c
-rw-r--r--libavcodec/dxa.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 7bd74f3c74..52a0fef58b 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);