[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/files/, media-libs/mlt/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     09fadf3ec3ead6c7b1dcd9c98988c473d43e942d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 21:01:26 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 21:44:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fadf3e

media-libs/mlt: fix crash in composite when PGM luma fails to load

Upstream commit 46a226217d8ec5bbf66a4fa3da138fd6924dd13b

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../mlt/files/mlt-6.20.0-crash-in-composite.patch  | 34 ++++++++++++++++++++++
 media-libs/mlt/mlt-6.20.0-r2.ebuild                |  1 +
 2 files changed, 35 insertions(+)

diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch
new file mode 100644
index 00000000000..e5ae5f01c9d
--- /dev/null
+++ b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch
@@ -0,0 +1,34 @@
+From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Wed, 25 Mar 2020 16:06:34 -0700
+Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load
+
+---
+ src/modules/core/transition_composite.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
+index e6d078e36..24a0d30c7 100644
+--- a/src/modules/core/transition_composite.c
++++ b/src/modules/core/transition_composite.c
+@@ -1,6 +1,6 @@
+ /*
+  * transition_composite.c -- compose one image over another using alpha channel
+- * Copyright (C) 2003-2019 Meltytech, LLC
++ * Copyright (C) 2003-2020 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w
+ 				{
+ 					luma_width = 0;
+ 					luma_height = 0;
+-                }
++				}
+ 			}
+ 		}
+-		if ( luma_width > 0 && luma_height > 0 )
++		if ( orig_bitmap && luma_width > 0 && luma_height > 0 )
+ 		{
+ 			// Scale luma map
+ 			luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) );

diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild
index d261114c200..745d4959228 100644
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild
@@ -89,6 +89,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-opencv4.patch
 	"${FILESDIR}"/${P}-nullpointer-crash.patch
 	"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch
+	"${FILESDIR}"/${P}-crash-in-composite.patch
 )
 
 pkg_setup() {