[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.6.0-1-3-g38d82f3

Patrick Matthäi pmatthaei at moszumanska.debian.org
Mon Mar 19 14:20:53 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=38d82f3

The following commit has been merged in the master branch:
commit 38d82f3568a1892804ac6727d70309ce81094f33
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Mon Mar 19 15:20:40 2018 +0100

    * Add upstream patch 03-crash-kdenlivetile.
---
 debian/changelog                          |  1 +
 debian/patches/03-crash-kdenlivetile.diff | 19 +++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 354deb0..3cfb422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mlt (6.6.0-2) UNRELEASED; urgency=medium
 
   * Add upstream patch 01-qimage-segfault.
   * Add upstream patch 02-qimage-crash.
+  * Add upstream patch 03-crash-kdenlivetile.´
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 01 Feb 2018 16:56:52 +0100
 
diff --git a/debian/patches/03-crash-kdenlivetile.diff b/debian/patches/03-crash-kdenlivetile.diff
new file mode 100644
index 0000000..0cb2a90
--- /dev/null
+++ b/debian/patches/03-crash-kdenlivetile.diff
@@ -0,0 +1,19 @@
+commit 95f7f7bc104ec35ed3c909e52d928313fd35a48c
+Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
+Date:   Mon Mar 19 09:20:49 2018 +0100
+
+    Fix crash with kdenlivetile caused by wrong malloc size
+
+diff --git a/src/modules/qt/producer_kdenlivetitle.c b/src/modules/qt/producer_kdenlivetitle.c
+index 67508aa3..4dc5d9c6 100644
+--- a/src/modules/qt/producer_kdenlivetitle.c
++++ b/src/modules/qt/producer_kdenlivetitle.c
+@@ -41,7 +41,7 @@ void read_xml(mlt_properties properties)
+ 			goto error;
+ 		rewind (f);
+ 
+-		char *infile = (char*) mlt_pool_alloc(lSize);
++		char *infile = (char*) mlt_pool_alloc(lSize + 1);
+ 		if ( infile )
+ 		{
+ 			size = fread(infile,1,lSize,f);
diff --git a/debian/patches/series b/debian/patches/series
index b0b7bdf..d00b944 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-qimage-segfault.diff
 02-qimage-crash.diff
+03-crash-kdenlivetile.diff

-- 
MLT multimedia framework packaging



More information about the pkg-kde-commits mailing list