diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 00:25:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:49 +0100 |
| commit | 6ba69f60ecb6693074bc7abcad67851a17e36c44 (patch) | |
| tree | 8ceb630571dff8e0f45d7b89bdb2d1acba9ff455 | |
| parent | 0814b140b1d7d6d324cb76b863b9cbc8f62abd58 (diff) | |
| download | ffmpeg-6ba69f60ecb6693074bc7abcad67851a17e36c44.tar.gz | |
avcodec/dxtory: Fix input size check in dxtory_decode_v1_410()
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 76b6f4b7d91901929177cc61d9810dcca0bb40c1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dxtory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index b89a45ff63..a103eaa064 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -65,7 +65,7 @@ static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic, uint8_t *Y1, *Y2, *Y3, *Y4, *U, *V; int ret; - if (src_size < avctx->width * avctx->height * 9LL / 8) { + if (src_size < FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) * 9LL / 8) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); return AVERROR_INVALIDDATA; } |