diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-22 02:57:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-26 00:14:21 +0200 |
| commit | 00b0d595eb4eb961b80bdc203f02af5a6a0d7b31 (patch) | |
| tree | edcf821b335d8574f42d77f7cf2c7f8ecf34d5d5 | |
| parent | b905d2948a0e269ecda7da593a67fc5ce8c01610 (diff) | |
| download | ffmpeg-00b0d595eb4eb961b80bdc203f02af5a6a0d7b31.tar.gz | |
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 <michael@niedermayer.cc>
(cherry picked from commit 03a9e6ff303ad82e75b734edbe4917ca5fd60159)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ylc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)++; |