fkastl/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Move metadata into patch/use established git patch line tags as far as doable

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=214
This commit is contained in:
Jan Engelhardt 2024-04-25 21:44:57 +00:00 committed by Git OBS Bridge
parent c72074a6f9
commit c86bcacd17
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ffmpeg-CVE-2023-49502.patch
View File

@ -1,22 +1,23 @@
commit 737ede405b11a37fdd61d19cf25df296a0cb0b75 From 737ede405b11a37fdd61d19cf25df296a0cb0b75
Author: Cosmin Stejerean <cosmin@cosmin.at> From: Cosmin Stejerean <cosmin@cosmin.at>
Date: Wed Dec 6 18:39:32 2023 +0800 Date: Wed Dec 6 18:39:32 2023 +0800
Subject: avfilter/bwdif: account for chroma sub-sampling in min size calculation
References: https://bugzilla.opensuse.org/1223235
References: CVE-2023-49502
avfilter/bwdif: account for chroma sub-sampling in min size calculation The current logic for detecting frames that are too small for the
algorithm does not account for chroma sub-sampling, and so a sample
The current logic for detecting frames that are too small for the where the luma plane is large enough, but the chroma planes are not
algorithm does not account for chroma sub-sampling, and so a sample will not be rejected. In that event, a heap overflow will occur.
where the luma plane is large enough, but the chroma planes are not
will not be rejected. In that event, a heap overflow will occur. This change adjusts the logic to consider the chroma planes and makes
the change to all three bwdif implementations.
This change adjusts the logic to consider the chroma planes and makes
the change to all three bwdif implementations. Fixes #10688
Fixes #10688 Signed-off-by: Cosmin Stejerean <cosmin@cosmin.at>
Reviewed-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: Cosmin Stejerean <cosmin@cosmin.at> Signed-off-by: Philip Langdale <philipl@overt.org>
Reviewed-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: Philip Langdale <philipl@overt.org>
diff -Nura ffmpeg-4.4.4/libavfilter/vf_bwdif.c ffmpeg-4.4.4_new/libavfilter/vf_bwdif.c diff -Nura ffmpeg-4.4.4/libavfilter/vf_bwdif.c ffmpeg-4.4.4_new/libavfilter/vf_bwdif.c
--- ffmpeg-4.4.4/libavfilter/vf_bwdif.c 2023-04-13 02:01:50.000000000 +0800 --- ffmpeg-4.4.4/libavfilter/vf_bwdif.c 2023-04-13 02:01:50.000000000 +0800

19
ffmpeg-CVE-2023-51793.patch
View File

@ -1,14 +1,15 @@
commit 0ecc1f0e48930723d7a467761b66850811c23e62 From 0ecc1f0e48930723d7a467761b66850811c23e62
Author: Michael Niedermayer <michael@niedermayer.cc> From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri Dec 22 12:31:35 2023 +0100 Date: Fri Dec 22 12:31:35 2023 +0100
Subject: avfilter/vf_weave: Fix odd height handling
avfilter/vf_weave: Fix odd height handling References: https://bugzilla.opensuse.org/1223272
References: CVE-2023-51793
Fixes: out of array access Fixes: out of array access
Fixes: tickets/10743/poc10ffmpeg Fixes: tickets/10743/poc10ffmpeg
Found-by: Zeng Yunxiang and Li Zeyuan Found-by: Zeng Yunxiang and Li Zeyuan
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
diff -Nura ffmpeg-4.4.4/libavfilter/vf_weave.c ffmpeg-4.4.4_new/libavfilter/vf_weave.c diff -Nura ffmpeg-4.4.4/libavfilter/vf_weave.c ffmpeg-4.4.4_new/libavfilter/vf_weave.c
--- ffmpeg-4.4.4/libavfilter/vf_weave.c 2023-04-13 02:01:50.000000000 +0800 --- ffmpeg-4.4.4/libavfilter/vf_weave.c 2023-04-13 02:01:50.000000000 +0800