From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2E90348AA2 for ; Sat, 27 Apr 2024 23:55:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A65EE68D3F1; Sun, 28 Apr 2024 02:54:39 +0300 (EEST) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97A6868D373 for ; Sun, 28 Apr 2024 02:54:30 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E88A0FF802 for ; Sat, 27 Apr 2024 23:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714262070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EW4XKhXkxiOyWZHZm9FhAaJlG4N7cXAQKui9/cEqY4M=; b=ZZLpoMb7SwRJsbKV/KA7CTyLLksr2CWUTPBM4hl87FHThBFUg471altsJnlReABGncrO13 We9sCCuBzAvM8aVP7+P3nKOxwcxnKPBheaKPrNROmB77MSwdWs+wmyM34eAxXBQsolEvgu SqTBEbevoc+paIWhNEidvr5Cq8gwgzqUaaky8sYTyNcaxlsyZGGKp1i7Bidh5Il8Sw0SUk oyLbsoLKLGjsmKW3jaljNA1tQYGpT1dTC8vbw06nn1086i9Qs6T1LTg4BVCbwGpIsVshN1 mjRdjTLaQ2c+GH45zJTRgh0GCibU4EyGmLwRlORY/ckm+SZGpmi5biTsid+AJg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 28 Apr 2024 01:54:20 +0200 Message-ID: <20240427235424.3075968-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240427235424.3075968-1-michael@niedermayer.cc> References: <20240427235424.3075968-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 06/10] fftools/ffmpeg_mux_init: Cleanup on error return in set_dispositions() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes: CID1539099 Resource leak Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- 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 885a7c0c102..7fd6c57d50f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -868,7 +868,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++) {\ @@ -878,12 +878,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 b1cb6cf7bd7..1262630b24e 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]; -- 2.43.2 _______________________________________________ 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".