diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 00:25:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-15 02:13:43 +0100 |
| commit | 588a7769c7adaa6713d253cbf35ea1fb967ca7da (patch) | |
| tree | 3c3e52dcc7b12a97824dbe773287ca9861989f7d | |
| parent | 08940cd54596935e8780029d5c8ebcc0f409b58f (diff) | |
| download | ffmpeg-588a7769c7adaa6713d253cbf35ea1fb967ca7da.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 c12a193265..4f84c524f0 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; } |