diff mbox series

[FFmpeg-devel,1/2] avcodec/sonic: Fix several integer overflows

Message ID 20200221113832.13969-1-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/2] avcodec/sonic: Fix several integer overflows
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Michael Niedermayer Feb. 21, 2020, 11:38 a.m. UTC
Fixes: signed integer overflow: 2129689466 + 2129689466 cannot be represented in type 'int'
Fixes: 20715/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-5155263109922816

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

Comments

Paul B Mahol Feb. 21, 2020, 1:25 p.m. UTC | #1
NAK

This code should be purged from the tree.

On 2/21/20, Michael Niedermayer <michael@niedermayer.cc> wrote:
> Fixes: signed integer overflow: 2129689466 + 2129689466 cannot be
> represented in type 'int'
> Fixes:
> 20715/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SONIC_fuzzer-5155263109922816
>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/sonic.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
> index c975774b04..b82c44344c 100644
> --- a/libavcodec/sonic.c
> +++ b/libavcodec/sonic.c
> @@ -140,7 +140,8 @@ static inline av_flatten int get_symbol(RangeCoder *c,
> uint8_t *state, int is_si
>      if(get_rac(c, state+0))
>          return 0;
>      else{
> -        int i, e, a;
> +        int i, e;
> +        unsigned a;
>          e= 0;
>          while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
>              e++;
> @@ -474,7 +475,7 @@ static int predictor_calc_error(int *k, int *state, int
> order, int error)
>      for (i = order-2; i >= 0; i--, k_ptr--, state_ptr--)
>      {
>          int k_value = *k_ptr, state_value = *state_ptr;
> -        x -= shift_down(k_value * state_value, LATTICE_SHIFT);
> +        x -= shift_down(k_value * (unsigned)state_value, LATTICE_SHIFT);
>          state_ptr[1] = state_value + shift_down(k_value * (unsigned)x,
> LATTICE_SHIFT);
>      }
>  #else
> @@ -1044,7 +1045,7 @@ static int sonic_decode_frame(AVCodecContext *avctx,
>                  x += s->channels;
>              }
>
> -            s->int_samples[x] = predictor_calc_error(s->predictor_k,
> s->predictor_state[ch], s->num_taps, s->coded_samples[ch][i] * quant);
> +            s->int_samples[x] = predictor_calc_error(s->predictor_k,
> s->predictor_state[ch], s->num_taps, s->coded_samples[ch][i] *
> (unsigned)quant);
>              x += s->channels;
>          }
>
> --
> 2.17.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index c975774b04..b82c44344c 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -140,7 +140,8 @@  static inline av_flatten int get_symbol(RangeCoder *c, uint8_t *state, int is_si
     if(get_rac(c, state+0))
         return 0;
     else{
-        int i, e, a;
+        int i, e;
+        unsigned a;
         e= 0;
         while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
             e++;
@@ -474,7 +475,7 @@  static int predictor_calc_error(int *k, int *state, int order, int error)
     for (i = order-2; i >= 0; i--, k_ptr--, state_ptr--)
     {
         int k_value = *k_ptr, state_value = *state_ptr;
-        x -= shift_down(k_value * state_value, LATTICE_SHIFT);
+        x -= shift_down(k_value * (unsigned)state_value, LATTICE_SHIFT);
         state_ptr[1] = state_value + shift_down(k_value * (unsigned)x, LATTICE_SHIFT);
     }
 #else
@@ -1044,7 +1045,7 @@  static int sonic_decode_frame(AVCodecContext *avctx,
                 x += s->channels;
             }
 
-            s->int_samples[x] = predictor_calc_error(s->predictor_k, s->predictor_state[ch], s->num_taps, s->coded_samples[ch][i] * quant);
+            s->int_samples[x] = predictor_calc_error(s->predictor_k, s->predictor_state[ch], s->num_taps, s->coded_samples[ch][i] * (unsigned)quant);
             x += s->channels;
         }