diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 15:26:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 20:27:41 +0100 |
| commit | 831416692b81586f6ef170e2fc021672528bd352 (patch) | |
| tree | 7bb7a31ca1580f47b41dc914812c41312b08d18e /libavcodec | |
| parent | b8129b1a7ab959cf2822e43377084d884d791058 (diff) | |
| download | ffmpeg-831416692b81586f6ef170e2fc021672528bd352.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90)
Conflicts:
libavcodec/dxa.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dxa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index e415da7187..6d754980c7 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -290,6 +290,11 @@ static av_cold int decode_init(AVCodecContext *avctx) { DxaDecContext * const c = avctx->priv_data; + if (avctx->width%4 || avctx->height%4) { + av_log(avctx, AV_LOG_ERROR, "dimensions are not a multiple of 4"); + return AVERROR_INVALIDDATA; + } + c->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; |