summaryrefslogtreecommitdiff
path: root/libavcodec/dxtory.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-15 00:25:11 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-15 00:32:19 +0100
commit76b6f4b7d91901929177cc61d9810dcca0bb40c1 (patch)
tree5ce4c9cb703431efb7fc18a2dd547022c2174330 /libavcodec/dxtory.c
parent9caa9414ccf2dcf8aee2695377dee830a5024c82 (diff)
downloadffmpeg-76b6f4b7d91901929177cc61d9810dcca0bb40c1.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>
Diffstat (limited to 'libavcodec/dxtory.c')
-rw-r--r--libavcodec/dxtory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 8a326b7f3b..fc1936985d 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;
}