diff mbox series

[FFmpeg-devel,2/7] avcodec/vp3dsp: Use unsigned constant to avoid undefined integer overflow in ff_vp3dsp_set_bounding_values()

Message ID 20201109230456.11188-2-michael@niedermayer.cc
State Accepted
Commit c7e775f7126562ae8cfe1411022efa000b572f01
Headers show
Series [FFmpeg-devel,1/7] avformat/sbgdec: Check that end is not before start | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Nov. 9, 2020, 11:04 p.m. UTC
Fixes: signed integer overflow: 64 * 33686018 cannot be represented in type 'int'
Fixes: 26911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-4904975073017856

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

Comments

Peter Ross Nov. 13, 2020, 6:44 a.m. UTC | #1
On Tue, Nov 10, 2020 at 12:04:51AM +0100, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 64 * 33686018 cannot be represented in type 'int'
> Fixes: 26911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-4904975073017856
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/vp3dsp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
> index f485fba1f6..ec859a679d 100644
> --- a/libavcodec/vp3dsp.c
> +++ b/libavcodec/vp3dsp.c
> @@ -490,5 +490,5 @@ void ff_vp3dsp_set_bounding_values(int * bounding_values_array, int filter_limit
>      }
>      if (value)
>          bounding_values[128] = value;
> -    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
> +    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202U;
>  }
> -- 
> 2.17.1

please apply

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
Michael Niedermayer Nov. 13, 2020, 5:04 p.m. UTC | #2
On Fri, Nov 13, 2020 at 05:44:44PM +1100, Peter Ross wrote:
> On Tue, Nov 10, 2020 at 12:04:51AM +0100, Michael Niedermayer wrote:
> > Fixes: signed integer overflow: 64 * 33686018 cannot be represented in type 'int'
> > Fixes: 26911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-4904975073017856
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/vp3dsp.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
> > index f485fba1f6..ec859a679d 100644
> > --- a/libavcodec/vp3dsp.c
> > +++ b/libavcodec/vp3dsp.c
> > @@ -490,5 +490,5 @@ void ff_vp3dsp_set_bounding_values(int * bounding_values_array, int filter_limit
> >      }
> >      if (value)
> >          bounding_values[128] = value;
> > -    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
> > +    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202U;
> >  }
> > -- 
> > 2.17.1
> 
> please apply

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
index f485fba1f6..ec859a679d 100644
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@ -490,5 +490,5 @@  void ff_vp3dsp_set_bounding_values(int * bounding_values_array, int filter_limit
     }
     if (value)
         bounding_values[128] = value;
-    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
+    bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202U;
 }