aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-10 14:33:27 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-20 03:41:33 +0200
commita98d82b13dafc0ed25aadcefd6e16b405c24bd82 (patch)
tree53d7731511b644393e94d97e1d0344bc61cd0a71
parent4dacf6bc4ac2a8f244fa89f010ef5f4955163eee (diff)
downloadffmpeg-a98d82b13dafc0ed25aadcefd6e16b405c24bd82.tar.gz
avcodec/y41pdec: Fix width in input buffer size check
Fixes: out of array read Fixes: 1437/clusterfuzz-testcase-minimized-4569970002362368 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3d8d3729475c7dce52d8fb9ffb280fd2ea62e1a2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/y41pdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c
index 1b177d4262..85a39e4ae2 100644
--- a/libavcodec/y41pdec.c
+++ b/libavcodec/y41pdec.c
@@ -43,7 +43,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data,
uint8_t *y, *u, *v;
int i, j, ret;
- if (avpkt->size < 3LL * avctx->height * avctx->width / 2) {
+ if (avpkt->size < 3LL * avctx->height * FFALIGN(avctx->width, 8) / 2) {
av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n");
return AVERROR(EINVAL);
}