[FFmpeg-cvslog] avfilter/af_loudnorm: fix crash when ebur128 initialization was not successfull/complete

Paul B Mahol git at videolan.org
Sat May 21 19:23:46 CEST 2016


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat May 21 19:22:00 2016 +0200| [defb960a47f6d8f801168e1c61399f6abfb79ef3] | committer: Paul B Mahol

avfilter/af_loudnorm: fix crash when ebur128 initialization was not successfull/complete

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=defb960a47f6d8f801168e1c61399f6abfb79ef3
---

 libavfilter/af_loudnorm.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c
index cb210d4..9d27c16 100644
--- a/libavfilter/af_loudnorm.c
+++ b/libavfilter/af_loudnorm.c
@@ -789,6 +789,9 @@ static av_cold void uninit(AVFilterContext *ctx)
     double i_in, i_out, lra_in, lra_out, thresh_in, thresh_out, tp_in, tp_out;
     int c;
 
+    if (!s->r128_in || !s->r128_out)
+        goto end;
+
     ebur128_loudness_range(s->r128_in, &lra_in);
     ebur128_loudness_global(s->r128_in, &i_in);
     ebur128_relative_threshold(s->r128_in, &thresh_in);
@@ -869,8 +872,11 @@ static av_cold void uninit(AVFilterContext *ctx)
         break;
     }
 
-    ebur128_destroy(&s->r128_in);
-    ebur128_destroy(&s->r128_out);
+end:
+    if (s->r128_in)
+        ebur128_destroy(&s->r128_in);
+    if (s->r128_out)
+        ebur128_destroy(&s->r128_out);
     av_freep(&s->limiter_buf);
     av_freep(&s->prev_smp);
     av_freep(&s->buf);



More information about the ffmpeg-cvslog mailing list