From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42EC71382C5 for ; Tue, 30 Jun 2020 21:44:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88A11E08F7; Tue, 30 Jun 2020 21:44:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 757CBE08FB for ; Tue, 30 Jun 2020 21:44:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9451334F2E3 for ; Tue, 30 Jun 2020 21:44:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C54442CB for ; Tue, 30 Jun 2020 21:44:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1593553443.9284c333c4c23eb00240f6a38533ecb2d27262dd.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch media-libs/mlt/mlt-6.20.0-r2.ebuild X-VCS-Directories: media-libs/mlt/files/ media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9284c333c4c23eb00240f6a38533ecb2d27262dd X-VCS-Branch: master Date: Tue, 30 Jun 2020 21:44:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1eacf78a-ef94-45e1-b51e-4dc218da6dbf X-Archives-Hash: dee5d083d4a1c436862a0302f2cd02ef commit: 9284c333c4c23eb00240f6a38533ecb2d27262dd Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 30 21:04:19 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 30 21:44:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9284c333 media-libs/mlt: Fix OpenCV tracker double deletion crash Upstream commit 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/mlt-6.20.0-opencv-double-del-crash.patch | 21 +++++++++++++++++++++ media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 + 2 files changed, 22 insertions(+) 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 new file mode 100644 index 00000000000..7f764965046 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.20.0-opencv-double-del-crash.patch @@ -0,0 +1,21 @@ +From 5e906b13cab7f28bbef43a33c20dbe24c2ca1f8d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Mardelle +Date: Tue, 17 Mar 2020 18:22:04 +0100 +Subject: [PATCH] Fix OpenCV tracker double deletion crash. Fixes #532 + +--- + src/modules/opencv/filter_opencv_tracker.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp +index 04a5f0b09..533f0f513 100644 +--- a/src/modules/opencv/filter_opencv_tracker.cpp ++++ b/src/modules/opencv/filter_opencv_tracker.cpp +@@ -351,7 +351,6 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame ) + static void filter_close( mlt_filter filter ) + { + private_data* data = (private_data*) filter->child; +- free ( data->tracker ); + free ( data ); + filter->child = NULL; + filter->close = NULL; diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild index 745d4959228..cef89ce3ef6 100644 --- a/media-libs/mlt/mlt-6.20.0-r2.ebuild +++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild @@ -90,6 +90,7 @@ PATCHES=( "${FILESDIR}"/${P}-nullpointer-crash.patch "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch "${FILESDIR}"/${P}-crash-in-composite.patch + "${FILESDIR}"/${P}-opencv-double-del-crash.patch ) pkg_setup() {