aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-04-20 01:05:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-05-09 11:27:34 +0200
commit430850d2f0152ff81bf060f40f23262673b1fdb5 (patch)
tree3dc22c456a8e7bf3c27995891e8bafb07be53b2e
parent485546eec10a13cbacd17901f02794952d621f20 (diff)
downloadffmpeg-430850d2f0152ff81bf060f40f23262673b1fdb5.tar.gz
avcodec/truemotion2: Fix 2 integer overflows in tm2_update_block()
Fixes: signed integer overflow: -2147483648 + -1 cannot be represented in type 'int' Fixes: 14107/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5694078680825856 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 f4a1b8d409639b2394589efe20ad55410cce391c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/truemotion2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 691a05a696..b0a6935b0d 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -674,8 +674,8 @@ static inline void tm2_update_block(TM2Context *ctx, AVFrame *pic, int bx, int b
/* update chroma */
for (j = 0; j < 2; j++) {
for (i = 0; i < 2; i++) {
- U[i] = Uo[i] + GET_TOK(ctx, TM2_UPD);
- V[i] = Vo[i] + GET_TOK(ctx, TM2_UPD);
+ U[i] = Uo[i] + (unsigned)GET_TOK(ctx, TM2_UPD);
+ V[i] = Vo[i] + (unsigned)GET_TOK(ctx, TM2_UPD);
}
U += Ustride;
V += Vstride;