[FFmpeg-devel] avcodec/truemotion2: Fix several integer overflows in tm2_motion_block()

Submitted by Michael Niedermayer on July 9, 2019, 4 p.m.

Details

Message ID 20190709160000.27896-1-michael@niedermayer.cc
State Accepted
Commit 9a353ea8766206bd302f3f12ca1d226237542908
Headers show

Commit Message

Michael Niedermayer July 9, 2019, 4 p.m.
Fixes: 15524/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5173148372172800
Fixes: signed integer overflow: 13701388 - -2134868270 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/truemotion2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Michael Niedermayer July 31, 2019, 6:04 p.m.
On Tue, Jul 09, 2019 at 06:00:00PM +0200, Michael Niedermayer wrote:
> Fixes: 15524/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5173148372172800
> Fixes: signed integer overflow: 13701388 - -2134868270 cannot be represented in type 'int'
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/truemotion2.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

will apply


[...]

Patch hide | download patch | download mbox

diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index a86dd16e0f..5d6dfc24c3 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -764,10 +764,10 @@  static inline void tm2_motion_block(TM2Context *ctx, AVFrame *pic, int bx, int b
     }
     /* calculate deltas */
     Y -= Ystride * 4;
-    ctx->D[0] = Y[3] - last[3];
-    ctx->D[1] = Y[3 + Ystride] - Y[3];
-    ctx->D[2] = Y[3 + Ystride * 2] - Y[3 + Ystride];
-    ctx->D[3] = Y[3 + Ystride * 3] - Y[3 + Ystride * 2];
+    ctx->D[0] = (unsigned)Y[3] - last[3];
+    ctx->D[1] = (unsigned)Y[3 + Ystride] - Y[3];
+    ctx->D[2] = (unsigned)Y[3 + Ystride * 2] - Y[3 + Ystride];
+    ctx->D[3] = (unsigned)Y[3 + Ystride * 3] - Y[3 + Ystride * 2];
     for (i = 0; i < 4; i++)
         last[i] = Y[i + Ystride * 3];
 }