From 68f6063e0470419d3691bc5a461944de61fc091f Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sun, 28 Apr 2024 00:42:03 +0200
Subject: [PATCH] fftools/ffmpeg_mux_init: Cleanup on error return in
 set_dispositions()

Fixes: CID1539099 Resource leak

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 fftools/ffmpeg.h          | 9 +++++++--
 fftools/ffmpeg_mux_init.c | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index fe75706afd..dc0d5fbeb3 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -865,7 +865,7 @@ void update_benchmark(const char *fmt, ...);
            namestr, st->index, o->optname.opt_canon->name, spec[0] ? ":" : "", spec, so->u.type);\
 }
 
-#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
+#define MATCH_PER_STREAM_OPT_CLEAN(name, type, outvar, fmtctx, st, clean)\
 {\
     int _ret, _matches = 0, _match_idx;\
     for (int _i = 0; _i < o->name.nb_opt; _i++) {\
@@ -875,12 +875,17 @@ void update_benchmark(const char *fmt, ...);
             _match_idx = _i;\
             _matches++;\
         } else if (_ret < 0)\
-            return _ret;\
+            clean;\
     }\
     if (_matches > 1 && o->name.opt_canon)\
        WARN_MULTIPLE_OPT_USAGE(name, type, _match_idx, st);\
 }
 
+#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
+{\
+    MATCH_PER_STREAM_OPT_CLEAN(name, type, outvar, fmtctx, st, return _ret)\
+}
+
 const char *opt_match_per_type_str(const SpecifierOptList *sol,
                                    char mediatype);
 
diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 1f19d9283a..7de5b5cd99 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -2933,7 +2933,7 @@ static int set_dispositions(Muxer *mux, const OptionsContext *o)
 
         nb_streams[ost->type + 1]++;
 
-        MATCH_PER_STREAM_OPT(disposition, str, dispositions[i], ctx, ost->st);
+        MATCH_PER_STREAM_OPT_CLEAN(disposition, str, dispositions[i], ctx, ost->st, goto finish);
 
         have_manual |= !!dispositions[i];