aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-03-27 00:39:56 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-02 19:41:47 +0100
commit12e4877ae251ab8b25984b1e4164b94ab08459d2 (patch)
tree26c634f531ba63c7c5df12f53bc9851093add22b
parent4bc3382780541ac0ccbb27bcb0a92c3887495040 (diff)
downloadffmpeg-12e4877ae251ab8b25984b1e4164b94ab08459d2.tar.gz
avcodec/truemotion2: Fix integer overflow in tm2_decode_blocks()
Fixes: signed integer overflow: 255 + 2147483634 cannot be represented in type 'int' Fixes: 13472/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5712444142387200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0ad0533e914a2618aea1dc77748037bd8459f61d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/truemotion2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index a42a1adefd..7ec2375cb2 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -816,7 +816,7 @@ static int tm2_decode_blocks(TM2Context *ctx, AVFrame *p)
dst = p->data[0];
for (j = 0; j < h; j++) {
for (i = 0; i < w; i++) {
- int y = Y[i], u = U[i >> 1], v = V[i >> 1];
+ unsigned y = Y[i], u = U[i >> 1], v = V[i >> 1];
dst[3*i+0] = av_clip_uint8(y + v);
dst[3*i+1] = av_clip_uint8(y);
dst[3*i+2] = av_clip_uint8(y + u);