From 9970fa10c0a58f7113050a1b87c5e0d01f80a638 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 7 May 2017 14:53:31 +0200 Subject: [PATCH] avcodec/magicyuv: Check len to be supported Fixes: shift exponent -1 is negative Fixes: 1390/clusterfuzz-testcase-minimized-5452757630713856 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 2162b862eba5aadb59c0cf7cc304c67f4a5fb946) Signed-off-by: Michael Niedermayer --- libavcodec/magicyuv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 6250536da6..5f09c0be53 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -97,6 +97,8 @@ static int huff_build10(VLC *vlc, uint8_t *len) for (i = 0; i < 1024; i++) { he[i].sym = 1023 - i; he[i].len = len[i]; + if (len[i] == 0) + return AVERROR_INVALIDDATA; } AV_QSORT(he, 1024, HuffEntry, huff_cmp_len10); @@ -127,6 +129,8 @@ static int huff_build(VLC *vlc, uint8_t *len) for (i = 0; i < 256; i++) { he[i].sym = 255 - i; he[i].len = len[i]; + if (len[i] == 0) + return AVERROR_INVALIDDATA; } AV_QSORT(he, 256, HuffEntry, huff_cmp_len);