Message ID | 20170301173125.29838-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 4b72d5cd6f9341dcafdbc1b9030166aa987b8304 |
Headers | show |
On Wed, Mar 01, 2017 at 06:31:23PM +0100, Michael Niedermayer wrote: > Fixes: 693/clusterfuzz-testcase-6109776066904064 > > 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 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) applied [...]
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 69469c5229..2b5adfc61b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1157,7 +1157,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, if (s->interlaced && s->bottom_field) ptr16 += linesize >> 1; pred &= mask; - *ptr16= pred + (dc << point_transform); + *ptr16= pred + ((unsigned)dc << point_transform); } if (++x == h) { x = 0;
Fixes: 693/clusterfuzz-testcase-6109776066904064 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)