summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2018-01-07 03:48:43 +0100
committerMichael Niedermayer <[email protected]>2018-01-31 22:56:15 +0100
commit82fb8dc076f7284f43b89ff177cb145951221947 (patch)
treecd4c9dc01c844285712a85ae4634facc610a388e
parent2885e45eb4674e945cc508257bfa389ec73e8dc7 (diff)
avcodec/h264addpx_template: Fixes integer overflows
Fixes: signed integer overflow: 512 + 2147483491 cannot be represented in type 'int' Fixes: 4780/clusterfuzz-testcase-minimized-4709066174627840 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit d6945aeee419a8417b8019c7c92227e12e45b7ad) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/h264addpx_template.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/h264addpx_template.c b/libavcodec/h264addpx_template.c
index 046b6c2e19..a99030c589 100644
--- a/libavcodec/h264addpx_template.c
+++ b/libavcodec/h264addpx_template.c
@@ -35,10 +35,10 @@ static void FUNCC(ff_h264_add_pixels4)(uint8_t *_dst, int16_t *_src, int stride)
stride /= sizeof(pixel);
for (i = 0; i < 4; i++) {
- dst[0] += src[0];
- dst[1] += src[1];
- dst[2] += src[2];
- dst[3] += src[3];
+ dst[0] += (unsigned)src[0];
+ dst[1] += (unsigned)src[1];
+ dst[2] += (unsigned)src[2];
+ dst[3] += (unsigned)src[3];
dst += stride;
src += 4;
@@ -55,14 +55,14 @@ static void FUNCC(ff_h264_add_pixels8)(uint8_t *_dst, int16_t *_src, int stride)
stride /= sizeof(pixel);
for (i = 0; i < 8; i++) {
- dst[0] += src[0];
- dst[1] += src[1];
- dst[2] += src[2];
- dst[3] += src[3];
- dst[4] += src[4];
- dst[5] += src[5];
- dst[6] += src[6];
- dst[7] += src[7];
+ dst[0] += (unsigned)src[0];
+ dst[1] += (unsigned)src[1];
+ dst[2] += (unsigned)src[2];
+ dst[3] += (unsigned)src[3];
+ dst[4] += (unsigned)src[4];
+ dst[5] += (unsigned)src[5];
+ dst[6] += (unsigned)src[6];
+ dst[7] += (unsigned)src[7];
dst += stride;
src += 8;