diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-26 21:34:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-01 20:12:11 +0100 |
| commit | 9ee5096068f665f2055df514142b51a9070d6324 (patch) | |
| tree | 03fec012c12f12ad074bc7e74ebc0b2bdfa9e4ef /libavcodec/truemotion2.c | |
| parent | f011572e66c8dd2f0ac3cb147a769e91f24e0202 (diff) | |
| download | ffmpeg-9ee5096068f665f2055df514142b51a9070d6324.tar.gz | |
avcodec/truemotion2: Fix several integer overflows with *Yo, *Uo, *Vo
Fixes: signed integer overflow: 538976288 - -2080374792 cannot be represented in type 'int'
Fixes: 16196/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5144044274974720
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/truemotion2.c')
| -rw-r--r-- | libavcodec/truemotion2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 800cae0a40..c736320cb6 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -443,7 +443,7 @@ static inline int GET_TOK(TM2Context *ctx,int type) clast = ctx->clast + bx * 4; #define TM2_INIT_POINTERS_2() \ - int *Yo, *Uo, *Vo;\ + unsigned *Yo, *Uo, *Vo;\ int oYstride, oUstride, oVstride;\ \ TM2_INIT_POINTERS();\ @@ -616,7 +616,7 @@ static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int for (i = 0; i < 16; i++) deltas[i] = 0; - ct = ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3]; + ct = (unsigned)ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3]; if (bx > 0) left = last[-1] - (unsigned)ct; @@ -687,8 +687,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] + (unsigned)GET_TOK(ctx, TM2_UPD); - V[i] = Vo[i] + (unsigned)GET_TOK(ctx, TM2_UPD); + U[i] = Uo[i] + GET_TOK(ctx, TM2_UPD); + V[i] = Vo[i] + GET_TOK(ctx, TM2_UPD); } U += Ustride; V += Vstride; @@ -701,10 +701,10 @@ static inline void tm2_update_block(TM2Context *ctx, AVFrame *pic, int bx, int b TM2_RECALC_BLOCK(V, Vstride, (clast + 2), (ctx->CD + 2)); /* update deltas */ - ctx->D[0] = (unsigned)Yo[3] - last[3]; - ctx->D[1] = (unsigned)Yo[3 + oYstride] - Yo[3]; - ctx->D[2] = (unsigned)Yo[3 + oYstride * 2] - Yo[3 + oYstride]; - ctx->D[3] = (unsigned)Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2]; + ctx->D[0] = Yo[3] - last[3]; + ctx->D[1] = Yo[3 + oYstride] - Yo[3]; + ctx->D[2] = Yo[3 + oYstride * 2] - Yo[3 + oYstride]; + ctx->D[3] = Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2]; for (j = 0; j < 4; j++) { d = last[3]; |