diff --git a/ffmpeg.spec b/ffmpeg.spec index 34faf2c..bf53394 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -72,7 +72,6 @@ Patch5: fix_libsvgdec_compile_error.patch Patch6: CVE-2023-49528.patch Patch7: fix-CVE-2023-49502.patch Patch8: fix-CVE-2024-32230.patch -#Patch9: fix-CVE-2024-32228.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -417,7 +416,7 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} - Remove riscv64 exclusive arch for chromium patch * Tue Jun 18 2024 happyworker <208suo@208suo.com> - 6.1.1-6 -- fix bug CVE-2023-49528.patch +- fix CVE-2023-49528.patch * Wed Jun 12 2024 technology208 - 6.1.1-5 - Add patch to fix libsvdec compile error diff --git a/fix-CVE-2024-32228.patch b/fix-CVE-2024-32228.patch deleted file mode 100644 index c88fb33..0000000 --- a/fix-CVE-2024-32228.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 459648761f5412acdc3317d5bac982ceaa257584 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Sat, 6 Apr 2024 13:11:09 +0200 -Subject: [PATCH] avcodec/hevcdec: fix segfault on invalid film grain metadata - -Invalid input files may contain film grain metadata which survives -ff_h274_film_grain_params_supported() but does not pass -av_film_grain_params_select(), leading to a SIGSEGV on hevc_frame_end(). - -Fix this by duplicating the av_film_grain_params_select() check at frame -init time. - -An alternative solution here would be to defer the incompatibility check -to hevc_frame_end(), but this has the downside of allocating a film -grain buffer even when we already know we can't apply film grain. - -Fixes: https://trac.ffmpeg.org/ticket/10951 ---- - libavcodec/hevcdec.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c -index e1710d7..d3b668a 100644 ---- a/libavcodec/hevcdec.c -+++ b/libavcodec/hevcdec.c -@@ -2893,9 +2893,15 @@ static int hevc_frame_start(HEVCContext *s) - !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && - !s->avctx->hwaccel; - -+ ret = set_side_data(s); -+ if (ret < 0) -+ goto fail; -+ - if (s->ref->needs_fg && -- !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, -- s->ref->frame->format)) { -+ ( s->sei.common.film_grain_characteristics.present && -+ !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, -+ s->ref->frame->format)) -+ || !av_film_grain_params_select(s->ref->frame)) { - av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, - "Unsupported film grain parameters. Ignoring film grain.\n"); - s->ref->needs_fg = 0; -@@ -2909,10 +2915,6 @@ static int hevc_frame_start(HEVCContext *s) - goto fail; - } - -- ret = set_side_data(s); -- if (ret < 0) -- goto fail; -- - s->frame->pict_type = 3 - s->sh.slice_type; - - if (!IS_IRAP(s)) --- -2.33.0 -