From c54673b86f7a6c923a2d625a31702cf053c5fa52 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 27 Oct 2017 13:54:40 +0200
Subject: af_lavfi: fix small memory leak

Plus restructure the error path to make this simpler.
---
 audio/filter/af_lavfi.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'audio')

diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c
index 47edf20293..14bd1bb1f1 100644
--- a/audio/filter/af_lavfi.c
+++ b/audio/filter/af_lavfi.c
@@ -92,6 +92,7 @@ static bool recreate_graph(struct af_instance *af, struct mp_audio *config)
     void *tmp = talloc_new(NULL);
     struct priv *p = af->priv;
     AVFilterContext *in = NULL, *out = NULL;
+    bool ok = false;
 
     if (!p->is_bridge && bstr0(p->cfg_graph).len == 0) {
         MP_FATAL(af, "lavfi: no filter graph set\n");
@@ -177,14 +178,17 @@ static bool recreate_graph(struct af_instance *af, struct mp_audio *config)
     assert(out->nb_inputs == 1);
     assert(in->nb_outputs == 1);
 
-    talloc_free(tmp);
-    return true;
-
+    ok = true;
 error:
-    MP_FATAL(af, "Can't configure libavfilter graph.\n");
-    avfilter_graph_free(&graph);
+
+    if (!ok) {
+        MP_FATAL(af, "Can't configure libavfilter graph.\n");
+        avfilter_graph_free(&graph);
+    }
+    avfilter_inout_free(&inputs);
+    avfilter_inout_free(&outputs);
     talloc_free(tmp);
-    return false;
+    return ok;
 }
 
 static void reset(struct af_instance *af)
-- 
cgit v1.2.3