Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-03-01 18:32:09 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-20 04:41:33 +0300
commit718c1433d9805776fa96303a99e5ccf03e8c276a (patch)
treeef05163846bb153cee916f402ae585ddab51e120 /libavcodec/mjpegdec.c
parentb9cc73fafbf7b4c696eb8bb1f53ba9d806f5cc4d (diff)
avcodec/mjpegdec: Fix runtime error: left shift of negative value -511
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> (cherry picked from commit 4b72d5cd6f9341dcafdbc1b9030166aa987b8304) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index fa6018dc90..826c037682 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1151,7 +1151,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;