| Message ID | 20170308222843.9289-3-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 800d02abe041deacab5585bf41c1bc2ae5f4b922 |
| Headers | show |
On Wed, Mar 08, 2017 at 11:28:40PM +0100, Michael Niedermayer wrote: > Fixes: 733/clusterfuzz-testcase-4682158096515072 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/mjpegdec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) applied [...]
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2b5adfc61b..4e78e1e3ae 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1196,13 +1196,13 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); pred &= mask; - *ptr = pred + (dc << point_transform); + *ptr = pred + ((unsigned)dc << point_transform); }else{ ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap PREDICT(pred, ptr16[-linesize-1], ptr16[-linesize], ptr16[-1], predictor); pred &= mask; - *ptr16= pred + (dc << point_transform); + *ptr16= pred + ((unsigned)dc << point_transform); } if (++x == h) {
Fixes: 733/clusterfuzz-testcase-4682158096515072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/mjpegdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)