virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-19 05:33:15 +02:00
Code Issues Releases Activity

avcodec/truemotion2: Fix several integer overflows with *Yo, *Uo, *Vo

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2019-10-26 21:34:44 +02:00
parent f011572e66
commit 9ee5096068
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/truemotion2.c
View File

@ -443,7 +443,7 @@ static inline int GET_TOK(TM2Context *ctx,int type)
clast = ctx->clast + bx * 4; clast = ctx->clast + bx * 4;
#define TM2_INIT_POINTERS_2() \ #define TM2_INIT_POINTERS_2() \
int *Yo, *Uo, *Vo;\ unsigned *Yo, *Uo, *Vo;\
int oYstride, oUstride, oVstride;\ int oYstride, oUstride, oVstride;\
\ \
TM2_INIT_POINTERS();\ 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++) for (i = 0; i < 16; i++)
deltas[i] = 0; 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) if (bx > 0)
left = last[-1] - (unsigned)ct; 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 */ /* update chroma */
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
U[i] = Uo[i] + (unsigned)GET_TOK(ctx, TM2_UPD); U[i] = Uo[i] + GET_TOK(ctx, TM2_UPD);
V[i] = Vo[i] + (unsigned)GET_TOK(ctx, TM2_UPD); V[i] = Vo[i] + GET_TOK(ctx, TM2_UPD);
} }
U += Ustride; U += Ustride;
V += Vstride; 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)); TM2_RECALC_BLOCK(V, Vstride, (clast + 2), (ctx->CD + 2));
/* update deltas */ /* update deltas */
ctx->D[0] = (unsigned)Yo[3] - last[3]; ctx->D[0] = Yo[3] - last[3];
ctx->D[1] = (unsigned)Yo[3 + oYstride] - Yo[3]; ctx->D[1] = Yo[3 + oYstride] - Yo[3];
ctx->D[2] = (unsigned)Yo[3 + oYstride * 2] - Yo[3 + oYstride]; ctx->D[2] = Yo[3 + oYstride * 2] - Yo[3 + oYstride];
ctx->D[3] = (unsigned)Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2]; ctx->D[3] = Yo[3 + oYstride * 3] - Yo[3 + oYstride * 2];
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
d = last[3]; d = last[3];