[ffmpeg] Backport upstream patch to fix segfault when passing non-existent filter option (rfbz#6773)

commit 82dc37749568b6112ef1f52d2dfa420f61b702e9 Author: Dominik Mierzejewski <dominik(a)greysector.net&gt; Date: Mon Oct 9 14:07:38 2023 +0200 Backport upstream patch to fix segfault when passing non-existent filter option (rfbz#6773) ...peg_filter-initialize-the-o-to-silence-th.patch | 30 ++++++++++++++++++++++ ffmpeg.spec | 9 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) --- diff --git a/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch new file mode 100644 index 0000000..85b43a4 --- /dev/null +++ b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch @@ -0,0 +1,30 @@ +From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001 +From: Jun Zhao <barryjzhao(a)tencent.com&gt; +Date: Sat, 25 Feb 2023 21:54:00 +0800 +Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the + warning + +silence the warning: variable 'o' is used uninitialized whenever +'&&' condition is false + +Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com&gt; +--- + fftools/ffmpeg_filter.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c +index 1f5bbf6c4d..3504a3cc0a 100644 +--- a/fftools/ffmpeg_filter.c ++++ b/fftools/ffmpeg_filter.c +@@ -362,7 +362,7 @@ fail: + + static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val) + { +- const AVOption *o; ++ const AVOption *o = NULL; + int ret; + + ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN); +-- +2.41.0 + diff --git a/ffmpeg.spec b/ffmpeg.spec index b5f46af..b5cbfdd 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 6.0 -Release: 17%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} +Release: 18%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} License: %{ffmpeg_license} URL: https://ffmpeg.org/ %if 0%{?date} @@ -125,6 +125,9 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc Patch0: 0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch Patch1: 0001-avfilter-vf_libplacebo-remove-deprecated-field.patch Patch2: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch +# Backport fix for segfault when passing non-existent filter option +# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773 +Patch3: 0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch Conflicts: %{name}-free Provides: %{name}-bin = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -533,6 +536,10 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.* %changelog +* Sun Oct 08 2023 Dominik Mierzejewski <dominik(a)greysector.net&gt; - 6.0-18 +- Backport upstream patch to fix segfault when passing non-existent filter + option (rfbz#6773) + * Fri Sep 29 2023 Nicolas Chauvet <nchauvet(a)linagora.com&gt; - 6.0-17 - Rebuild for libplacebo - Backport upstream patch to fix assembly with binutils 2.41 - rathann