Message ID | 20170520155221.20932-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 64d0dad93c18a517e92d152fdf7cbf92f1cf0a68 |
Headers | show |
On Sat, 20 May 2017, Michael Niedermayer wrote:
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
This URL is a 404 for me, I guess the correct URL is
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Regards,
Marton
On Sat, May 20, 2017 at 07:26:50PM +0200, Marton Balint wrote: > > On Sat, 20 May 2017, Michael Niedermayer wrote: > > >Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > > This URL is a 404 for me, I guess the correct URL is > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg yes that was apparently changed in a143b9b39a51412d133f846688194d68fe4197ba ill fix the link in future commits thx [...]
On Sat, May 20, 2017 at 11:06:45PM +0200, Michael Niedermayer wrote: > On Sat, May 20, 2017 at 07:26:50PM +0200, Marton Balint wrote: > > > > On Sat, 20 May 2017, Michael Niedermayer wrote: > > > > >Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > > > > This URL is a 404 for me, I guess the correct URL is > > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > yes that was apparently changed in a143b9b39a51412d133f846688194d68fe4197ba > > ill fix the link in future commits applied [...]
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 31d703135a..65dbc060a8 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -447,12 +447,12 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded, tfilter[0] = s->predictors[0] * 64; for (i = 1; i < filter_order; i++) { - int32_t *p1 = &tfilter[0]; - int32_t *p2 = &tfilter[i - 1]; + uint32_t *p1 = &tfilter[0]; + uint32_t *p2 = &tfilter[i - 1]; for (j = 0; j < (i + 1) / 2; j++) { - x = *p1 + (s->predictors[i] * *p2 + 256 >> 9); - *p2 += s->predictors[i] * *p1 + 256 >> 9; + x = *p1 + ((int32_t)(s->predictors[i] * *p2 + 256) >> 9); + *p2 += (int32_t)(s->predictors[i] * *p1 + 256) >> 9; *p1++ = x; p2--; }
Fixes: 1706/clusterfuzz-testcase-minimized-6112772670619648 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)