avcodec/hevcdsp_template: Fix invalid shift in put_hevc_epel_bi_w_v()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Nov 2017 21:01:29 +0000 (22:01 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Nov 2017 20:29:00 +0000 (21:29 +0100)
Fixes: runtime error: left shift of negative value -255
Fixes: 4037/clusterfuzz-testcase-minimized-5290998163832832

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hevcdsp_template.c

index e09c661..46a0da2 100644 (file)
@@ -1407,7 +1407,7 @@ static void FUNC(put_hevc_epel_bi_w_v)(uint8_t *_dst, ptrdiff_t _dststride, uint
     for (y = 0; y < height; y++) {
         for (x = 0; x < width; x++)
             dst[x] = av_clip_pixel(((EPEL_FILTER(src, srcstride) >> (BIT_DEPTH - 8)) * wx1 + src2[x] * wx0 +
-                                    ((ox0 + ox1 + 1) << log2Wd)) >> (log2Wd + 1));
+                                    ((ox0 + ox1 + 1) * (1 << log2Wd))) >> (log2Wd + 1));
         src  += srcstride;
         dst  += dststride;
         src2 += MAX_PB_SIZE;