diff options
| author | Michael Niedermayer <[email protected]> | 2021-07-25 15:50:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-09-09 13:59:05 +0200 |
| commit | ad3df92f538abae3578e6be4991879b56f02d6cd (patch) | |
| tree | 1115bb77a24903784a6c56e1e554bd35891bbb79 | |
| parent | d6d46907c6a23671115d0ab6be6c138ee89183cc (diff) | |
avcodec/webp: Check available space in loop in decode_entropy_coded_image()
Fixes: Timeout
Fixes: 35401/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WEBP_fuzzer-5714401821851648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 5e00eab61112c52f27a09fe77d50e6fc508f9c53)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/webp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index 077bb06f85..5486deee58 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -665,6 +665,9 @@ static int decode_entropy_coded_image(WebPContext *s, enum ImageRole role, while (y < img->frame->height) { int v; + if (get_bits_left(&s->gb) < 0) + return AVERROR_INVALIDDATA; + hg = get_huffman_group(s, img, x, y); v = huff_reader_get_symbol(&hg[HUFF_IDX_GREEN], &s->gb); if (v < NUM_LITERAL_CODES) { |