ffmpeg | branch: release/3.1 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Jul 22 02:57:12 2017 +0200| [a0edd7f583b8f63340a3c46c04d44f2ed5e0d4e7] | committer: Michael Niedermayer
avcodec/ylc: Fix shift overflow Fixes: runtime error: shift exponent 32 is too large for 32-bit type 'unsigned int' Fixes: 2698/clusterfuzz-testcase-minimized-4713541443518464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 03a9e6ff303ad82e75b734edbe4917ca5fd60159) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0edd7f583b8f63340a3c46c04d44f2ed5e0d4e7 --- libavcodec/ylc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ylc.c b/libavcodec/ylc.c index c2263e729a..346960a6cc 100644 --- a/libavcodec/ylc.c +++ b/libavcodec/ylc.c @@ -68,7 +68,7 @@ static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, s = nodes[node].sym; if (s != -1) { - bits[*pos] = (~pfx) & ((1U << FFMAX(pl, 1)) - 1); + bits[*pos] = (~pfx) & ((1ULL << FFMAX(pl, 1)) - 1); lens[*pos] = FFMAX(pl, 1); xlat[*pos] = s + (pl == 0); (*pos)++; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
