diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-28 03:18:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-28 04:08:56 +0200 |
| commit | bd4dcd873166c5affe2d684a372b279f1f55d818 (patch) | |
| tree | 132badd255d5c279be0b0dc8dbfcca49199e7956 | |
| parent | 25442bd95fdf1f46d3f994e7600ea427654dee8c (diff) | |
| download | ffmpeg-bd4dcd873166c5affe2d684a372b279f1f55d818.tar.gz | |
avcodec/wnv1: More strict buffer size check
This requires at least 25% of a picture to allocate and decode it
Fixes: Timeout
Fixes: 1845/clusterfuzz-testcase-minimized-5075974343360512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7f50c25124a015a539823077bb302ff0c7ce8963)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/wnv1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 126c01a02d..915e9c7dc9 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -68,7 +68,7 @@ static int decode_frame(AVCodecContext *avctx, int prev_y = 0, prev_u = 0, prev_v = 0; uint8_t *rbuf; - if (buf_size <= 8) { + if (buf_size < 8 + avctx->height * (avctx->width/2)/8) { av_log(avctx, AV_LOG_ERROR, "Packet size %d is too small\n", buf_size); return AVERROR_INVALIDDATA; } |