diff mbox

[FFmpeg-devel,7/7] avcodec/truemotion2: Fix multiple integer overflows in

Message ID 20190815214915.909-7-michael@niedermayer.cc
State Accepted
Commit cc78783ce5e8837d4f4ca43eedf2d299651e65ff
Headers show

Commit Message

Michael Niedermayer Aug. 15, 2019, 9:49 p.m. UTC 
Fixes: signed integer overflow: 1795032576 + 598344192 cannot be represented in type 'int'
Fixes: 16196/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5636723419119616

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Moritz Barsnick Aug. 17, 2019, 1:40 p.m. UTC | #1 
On Thu, Aug 15, 2019 at 23:49:15 +0200, Michael Niedermayer wrote:
> Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/truemotion2: Fix multiple integer overflows in

... in what? Spurious " in"?

Moritz
Michael Niedermayer Aug. 18, 2019, 9:21 a.m. UTC | #2 
On Sat, Aug 17, 2019 at 03:40:26PM +0200, Moritz Barsnick wrote:
> On Thu, Aug 15, 2019 at 23:49:15 +0200, Michael Niedermayer wrote:
> > Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/truemotion2: Fix multiple integer overflows in
> 
> ... in what? Spurious " in"?

... overflows in tm2_null_res_block()

fixed locally

thx

[...]
Michael Niedermayer Aug. 31, 2019, 4:10 p.m. UTC | #3 
On Sun, Aug 18, 2019 at 11:21:04AM +0200, Michael Niedermayer wrote:
> On Sat, Aug 17, 2019 at 03:40:26PM +0200, Moritz Barsnick wrote:
> > On Thu, Aug 15, 2019 at 23:49:15 +0200, Michael Niedermayer wrote:
> > > Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/truemotion2: Fix multiple integer overflows in
> > 
> > ... in what? Spurious " in"?
> 
> ... overflows in tm2_null_res_block()
> 
> fixed locally

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 5d6dfc24c3..27c876fd7d 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -619,7 +619,7 @@  static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int
     ct = ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3];
 
     if (bx > 0)
-        left = last[-1] - ct;
+        left = last[-1] - (unsigned)ct;
     else
         left = 0;
 
@@ -630,7 +630,7 @@  static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int
     last[2] = right - (diff >> 2);
     last[3] = right;
     {
-        int tp = left;
+        unsigned tp = left;
 
         ctx->D[0] = (tp + (ct >> 2)) - left;
         left     += ctx->D[0];