pool/ffmpeg-6
SHA256
6
0
Fork 5
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo renames from rq 1189369 rejected by factory-auto in rq 1189861

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=41
This commit is contained in:
Jan Engelhardt 2024-07-27 06:18:39 +00:00 committed by Git OBS Bridge
parent 850606dbb3
commit e279b3439a
4 changed files with 4 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ffmpeg-6-CVE-2023-50007.patch
View File

@ -1,68 +0,0 @@
From b1942734c7cbcdc9034034373abcc9ecb9644c47 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 27 Nov 2023 11:45:34 +0100
Subject: [PATCH] avfilter/af_afwtdn: fix crash with EOF handling
References: https://bugzilla.opensuse.org/1223253
References: CVE-2023-50007
diff -Nura ffmpeg-6.1.1/libavfilter/af_afwtdn.c ffmpeg-6.1.1_new/libavfilter/af_afwtdn.c
--- ffmpeg-6.1.1/libavfilter/af_afwtdn.c 2023-11-11 08:25:17.000000000 +0800
+++ ffmpeg-6.1.1_new/libavfilter/af_afwtdn.c 2024-04-25 14:15:23.737350315 +0800
@@ -408,6 +408,7 @@
uint64_t sn;
int64_t eof_pts;
+ int eof;
int wavelet_type;
int channels;
@@ -1069,7 +1070,7 @@
s->drop_samples = 0;
} else {
if (s->padd_samples < 0 && eof) {
- out->nb_samples += s->padd_samples;
+ out->nb_samples = FFMAX(0, out->nb_samples + s->padd_samples);
s->padd_samples = 0;
}
if (!eof)
@@ -1208,23 +1209,26 @@
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
- ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
- if (ret < 0)
- return ret;
- if (ret > 0)
- return filter_frame(inlink, in);
+ if (!s->eof) {
+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
+ if (ret < 0)
+ return ret;
+ if (ret > 0)
+ return filter_frame(inlink, in);
+ }
if (ff_inlink_acknowledge_status(inlink, &status, &pts)) {
- if (status == AVERROR_EOF) {
- while (s->padd_samples != 0) {
- ret = filter_frame(inlink, NULL);
- if (ret < 0)
- return ret;
- }
- ff_outlink_set_status(outlink, status, pts);
- return ret;
- }
+ if (status == AVERROR_EOF)
+ s->eof = 1;
}
+
+ if (s->eof && s->padd_samples != 0) {
+ return filter_frame(inlink, NULL);
+ } else if (s->eof) {
+ ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts);
+ return 0;
+ }
+
FF_FILTER_FORWARD_WANTED(outlink, inlink);
return FFERROR_NOT_READY;

19
ffmpeg-6-CVE-2023-50008.patch
View File

@ -1,19 +0,0 @@
From 5f87a68cf70dafeab2fb89b42e41a4c29053b89b Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon Nov 27 12:08:20 2023 +0100
Subject: avfilter/vf_colorcorrect: fix memory leaks
References: https://bugzilla.opensuse.org/1223254
References: CVE-2023-50008
diff -Nura ffmpeg-6.1.1/libavfilter/vf_colorcorrect.c ffmpeg-6.1.1_new/libavfilter/vf_colorcorrect.c
--- ffmpeg-6.1.1/libavfilter/vf_colorcorrect.c 2023-11-11 08:25:17.000000000 +0800
+++ ffmpeg-6.1.1_new/libavfilter/vf_colorcorrect.c 2024-04-25 14:35:29.717468737 +0800
@@ -497,6 +497,8 @@
ColorCorrectContext *s = ctx->priv;
av_freep(&s->analyzeret);
+ av_freep(&s->uhistogram);
+ av_freep(&s->vhistogram);
}
static const AVFilterPad colorcorrect_inputs[] = {

7
ffmpeg-6.changes
View File

@ -43,13 +43,6 @@ Tue Jul 2 11:54:01 UTC 2024 - Cliff Zhao <qzhao@suse.com>
to prepare dependence code for CVE-2024-32228. to prepare dependence code for CVE-2024-32228.
(CVE-2024-32228, bsc#1227277) (CVE-2024-32228, bsc#1227277)
-------------------------------------------------------------------
Tue Jul 2 11:28:10 UTC 2024 - Cliff Zhao <qzhao@suse.com>
- Rename CVE patches as SUSE CVE standard:(package name)-%(CVE number)
ffmpeg-CVE-2023-50007.patch
ffmpeg-CVE-2023-50008.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 23 14:05:28 UTC 2024 - Cliff Zhao <qzhao@suse.com> Thu Apr 23 14:05:28 UTC 2024 - Cliff Zhao <qzhao@suse.com>

8
ffmpeg-6.spec
View File

@ -117,8 +117,8 @@ Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch
Patch90: ffmpeg-chromium.patch Patch90: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch Patch91: ffmpeg-dlopen-openh264.patch
Patch92: ffmpeg-6-CVE-2023-50007.patch Patch92: ffmpeg-CVE-2023-50007.patch
Patch93: ffmpeg-6-CVE-2023-50008.patch Patch93: ffmpeg-CVE-2023-50008.patch
Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch
Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch
Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch
@ -848,8 +848,8 @@ Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch
Patch90: ffmpeg-chromium.patch Patch90: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch Patch91: ffmpeg-dlopen-openh264.patch
Patch92: ffmpeg-6-CVE-2023-50007.patch Patch92: ffmpeg-CVE-2023-50007.patch
Patch93: ffmpeg-6-CVE-2023-50008.patch Patch93: ffmpeg-CVE-2023-50008.patch
Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch Patch94: ffmpeg-6-CVE-2024-32228-shim-1535d338.patch
Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch Patch95: ffmpeg-6-CVE-2024-32228-shim-f50382cb.patch
Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch Patch96: ffmpeg-6-CVE-2024-32228-shim-5d7f234e.patch