| 1 |
commit: 09fadf3ec3ead6c7b1dcd9c98988c473d43e942d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 30 21:01:26 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 30 21:44:02 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fadf3e |
| 7 |
|
| 8 |
media-libs/mlt: fix crash in composite when PGM luma fails to load |
| 9 |
|
| 10 |
Upstream commit 46a226217d8ec5bbf66a4fa3da138fd6924dd13b |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../mlt/files/mlt-6.20.0-crash-in-composite.patch | 34 ++++++++++++++++++++++ |
| 16 |
media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 + |
| 17 |
2 files changed, 35 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..e5ae5f01c9d |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-libs/mlt/files/mlt-6.20.0-crash-in-composite.patch |
| 24 |
@@ -0,0 +1,34 @@ |
| 25 |
+From 46a226217d8ec5bbf66a4fa3da138fd6924dd13b Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Dan Dennedy <dan@×××××××.org> |
| 27 |
+Date: Wed, 25 Mar 2020 16:06:34 -0700 |
| 28 |
+Subject: [PATCH] fix #535 crash in composite when PGM luma fails to load |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ src/modules/core/transition_composite.c | 6 +++--- |
| 32 |
+ 1 file changed, 3 insertions(+), 3 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c |
| 35 |
+index e6d078e36..24a0d30c7 100644 |
| 36 |
+--- a/src/modules/core/transition_composite.c |
| 37 |
++++ b/src/modules/core/transition_composite.c |
| 38 |
+@@ -1,6 +1,6 @@ |
| 39 |
+ /* |
| 40 |
+ * transition_composite.c -- compose one image over another using alpha channel |
| 41 |
+- * Copyright (C) 2003-2019 Meltytech, LLC |
| 42 |
++ * Copyright (C) 2003-2020 Meltytech, LLC |
| 43 |
+ * |
| 44 |
+ * This library is free software; you can redistribute it and/or |
| 45 |
+ * modify it under the terms of the GNU Lesser General Public |
| 46 |
+@@ -697,10 +697,10 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w |
| 47 |
+ { |
| 48 |
+ luma_width = 0; |
| 49 |
+ luma_height = 0; |
| 50 |
+- } |
| 51 |
++ } |
| 52 |
+ } |
| 53 |
+ } |
| 54 |
+- if ( luma_width > 0 && luma_height > 0 ) |
| 55 |
++ if ( orig_bitmap && luma_width > 0 && luma_height > 0 ) |
| 56 |
+ { |
| 57 |
+ // Scale luma map |
| 58 |
+ luma_bitmap = mlt_pool_alloc( width * height * sizeof( uint16_t ) ); |
| 59 |
|
| 60 |
diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 61 |
index d261114c200..745d4959228 100644 |
| 62 |
--- a/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 63 |
+++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild |
| 64 |
@@ -89,6 +89,7 @@ PATCHES=( |
| 65 |
"${FILESDIR}"/${P}-opencv4.patch |
| 66 |
"${FILESDIR}"/${P}-nullpointer-crash.patch |
| 67 |
"${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch |
| 68 |
+ "${FILESDIR}"/${P}-crash-in-composite.patch |
| 69 |
) |
| 70 |
|
| 71 |
pkg_setup() { |
Archives