diff mbox

[FFmpeg-devel] avcodec/aacsbr: Fix libavcodec/aacsbr.c:257:59: runtime error: division by zero

Message ID 20170528191923.25104-1-michael@niedermayer.cc
State Accepted
Commit f6ba58d193d965df388224b1b18a6066ee9b4eea
Headers show

Commit Message

Michael Niedermayer May 28, 2017, 7:19 p.m. UTC
Fixes: 1882/clusterfuzz-testcase-minimized-5539735650959360

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

Comments

Rostislav Pehlivanov May 28, 2017, 7:35 p.m. UTC | #1
On 28 May 2017 at 20:19, Michael Niedermayer <michael@niedermayer.cc> wrote:

> Fixes: 1882/clusterfuzz-testcase-minimized-5539735650959360
>
> Found-by: continuous fuzzing process https://github.com/google/oss-
> fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/aacsbr.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
> index 15956e3f05..1d2a8d472d 100644
> --- a/libavcodec/aacsbr.c
> +++ b/libavcodec/aacsbr.c
> @@ -241,6 +241,7 @@ static void sbr_gain_calc(AACContext *ac,
> SpectralBandReplication *sbr,
>                                              ((1.0f + sbr->e_curr[e][m]) *
>                                               (1.0f +
> sbr->q_mapped[e][m])));
>                  }
> +                sbr->gain[e][m] += FLT_MIN;
>              }
>              for (m = sbr->f_tablelim[k] - sbr->kx[1]; m <
> sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
>                  sum[0] += sbr->e_origmapped[e][m];
> --
> 2.13.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

Patch LGTM
Michael Niedermayer May 29, 2017, 12:01 a.m. UTC | #2
On Sun, May 28, 2017 at 08:35:25PM +0100, Rostislav Pehlivanov wrote:
> On 28 May 2017 at 20:19, Michael Niedermayer <michael@niedermayer.cc> wrote:
> 
> > Fixes: 1882/clusterfuzz-testcase-minimized-5539735650959360
> >
> > Found-by: continuous fuzzing process https://github.com/google/oss-
> > fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/aacsbr.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
> > index 15956e3f05..1d2a8d472d 100644
> > --- a/libavcodec/aacsbr.c
> > +++ b/libavcodec/aacsbr.c
> > @@ -241,6 +241,7 @@ static void sbr_gain_calc(AACContext *ac,
> > SpectralBandReplication *sbr,
> >                                              ((1.0f + sbr->e_curr[e][m]) *
> >                                               (1.0f +
> > sbr->q_mapped[e][m])));
> >                  }
> > +                sbr->gain[e][m] += FLT_MIN;
> >              }
> >              for (m = sbr->f_tablelim[k] - sbr->kx[1]; m <
> > sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
> >                  sum[0] += sbr->e_origmapped[e][m];
> > --
> > 2.13.0
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> Patch LGTM

applied

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 15956e3f05..1d2a8d472d 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -241,6 +241,7 @@  static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr,
                                             ((1.0f + sbr->e_curr[e][m]) *
                                              (1.0f + sbr->q_mapped[e][m])));
                 }
+                sbr->gain[e][m] += FLT_MIN;
             }
             for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) {
                 sum[0] += sbr->e_origmapped[e][m];