| Message ID | 20170516223118.19122-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 955db411929a9876d3cd016fbbb9c49b6362feba |
| Headers | show |
On Wed, May 17, 2017 at 12:31:18AM +0200, Michael Niedermayer wrote: > Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> applied [...]
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 42939b4058..4cfb95a893 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -267,11 +267,11 @@ static int decode_segment(TAKDecContext *s, int8_t mode, int32_t *decoded, int l code = xcodes[mode - 1]; for (i = 0; i < len; i++) { - int x = get_bits_long(gb, code.init); + unsigned x = get_bits_long(gb, code.init); if (x >= code.escape && get_bits1(gb)) { x |= 1 << code.init; if (x >= code.aescape) { - int scale = get_unary(gb, 1, 9); + unsigned scale = get_unary(gb, 1, 9); if (scale == 9) { int scale_bits = get_bits(gb, 3); if (scale_bits > 0) {
Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/takdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)