avcodec/dxtory: Fix input size check in dxtory_decode_v1_410()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 14 Nov 2015 23:25:11 +0000 (00:25 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Nov 2015 01:13:43 +0000 (02:13 +0100)
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>
libavcodec/dxtory.c

index c12a193..4f84c52 100644 (file)
@@ -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;
     }