ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Jul 12 17:25:16 2017 +0200| [341f01290c2353669ed2263f56e1a9f4c67cc597] | committer: Michael Niedermayer
avcodec/magicyuv: Check that vlc len is not too large Fixes: runtime error: shift exponent -95 is negative Fixes: 2568/clusterfuzz-testcase-minimized-4926115716005888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=341f01290c2353669ed2263f56e1a9f4c67cc597 --- libavcodec/magicyuv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 447fe33aff..3c1a89077b 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -104,7 +104,7 @@ 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) + if (len[i] == 0 || len[i] > 32) return AVERROR_INVALIDDATA; } AV_QSORT(he, 1024, HuffEntry, huff_cmp_len10); @@ -136,7 +136,7 @@ static int huff_build12(VLC *vlc, uint8_t *len) for (i = 0; i < 4096; i++) { he[i].sym = 4095 - i; he[i].len = len[i]; - if (len[i] == 0) + if (len[i] == 0 || len[i] > 32) return AVERROR_INVALIDDATA; } AV_QSORT(he, 4096, HuffEntry, huff_cmp_len12); @@ -168,7 +168,7 @@ 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) + if (len[i] == 0 || len[i] > 32) return AVERROR_INVALIDDATA; } AV_QSORT(he, 256, HuffEntry, huff_cmp_len); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
