summaryrefslogtreecommitdiff
path: root/libavcodec/webp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-07-25 15:50:54 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-08-22 18:08:00 +0200
commit5e00eab61112c52f27a09fe77d50e6fc508f9c53 (patch)
treece90f279eb065ddd01bc4939234eb3b51d5fa55a /libavcodec/webp.c
parent65892516d52c268bd66ef825c4b1c8050a69d732 (diff)
downloadffmpeg-5e00eab61112c52f27a09fe77d50e6fc508f9c53.tar.gz
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 <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/webp.c')
-rw-r--r--libavcodec/webp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index 83371ef6fd..3efd4438d9 100644
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -627,6 +627,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) {