diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-01-31 19:20:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-12 03:02:29 +0100 |
| commit | c402b672b7641e9002868ee26be82a01048f7aed (patch) | |
| tree | 2426c6d4a91a2ad46e7e2dc2ba92d8d28c5fa858 | |
| parent | 263bddf78159668383afadf1c2db73f74b265377 (diff) | |
| download | ffmpeg-c402b672b7641e9002868ee26be82a01048f7aed.tar.gz | |
avcodec/huffyuvdec: Check input buffer size
Fixes: Timeout
Fixes: 5487/clusterfuzz-testcase-4696837035393024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 08c220d26cff51ca2f6896b65aebfa3accc67290)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/huffyuvdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index a700abb941..4285479351 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -913,6 +913,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVFrame *const p = data; int table_size = 0, ret; + if (buf_size < (width * height + 7)/8) + return AVERROR_INVALIDDATA; + av_fast_padded_malloc(&s->bitstream_buffer, &s->bitstream_buffer_size, buf_size); |