Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/
Date: Tue, 30 Jun 2020 21:44:33
Message-Id: 1593553443.9284c333c4c23eb00240f6a38533ecb2d27262dd.asturm@gentoo
1 commit: 9284c333c4c23eb00240f6a38533ecb2d27262dd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 30 21:04:19 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 21:44:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9284c333
7
8 media-libs/mlt: Fix OpenCV tracker double deletion crash
9
10 Upstream commit 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d
11
12 Package-Manager: Portage-2.3.103, Repoman-2.3.23
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 +++++++++++++++++++++
16 media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 +
17 2 files changed, 22 insertions(+)
18
19 diff --git a/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch
20 new file mode 100644
21 index 00000000000..7f764965046
22 --- /dev/null
23 +++ b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch
24 @@ -0,0 +1,21 @@
25 +From 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Mon Sep 17 00:00:00 2001
26 +From: Jean-Baptiste Mardelle <jb@××××××××.org>
27 +Date: Tue, 17 Mar 2020 18:22:04 +0100
28 +Subject: [PATCH] Fix OpenCV tracker double deletion crash. Fixes #532
29 +
30 +---
31 + src/modules/opencv/filter_opencv_tracker.cpp | 1 -
32 + 1 file changed, 1 deletion(-)
33 +
34 +diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
35 +index 04a5f0b09..533f0f513 100644
36 +--- a/src/modules/opencv/filter_opencv_tracker.cpp
37 ++++ b/src/modules/opencv/filter_opencv_tracker.cpp
38 +@@ -351,7 +351,6 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
39 + static void filter_close( mlt_filter filter )
40 + {
41 + private_data* data = (private_data*) filter->child;
42 +- free ( data->tracker );
43 + free ( data );
44 + filter->child = NULL;
45 + filter->close = NULL;
46
47 diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild
48 index 745d4959228..cef89ce3ef6 100644
49 --- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
50 +++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
51 @@ -90,6 +90,7 @@ PATCHES=(
52 "${FILESDIR}"/${P}-nullpointer-crash.patch
53 "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
54 "${FILESDIR}"/${P}-crash-in-composite.patch
55 + "${FILESDIR}"/${P}-opencv-double-del-crash.patch
56 )
57
58 pkg_setup() {