[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.4.1-1-2-gafddb4f

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit afddb4fbe6b71d245e8653c52fad6d113307020c
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Mon Feb 6 12:28:18 2017 +0100

    * Add upstream patch 02-crash-clipinfo-update to fix a crash in kdenlive when
      a clip has no resource.
---
 debian/changelog                             |  2 ++
 debian/patches/02-crash-clipinfo-update.diff | 19 +++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cb1f655..3f38843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mlt (6.4.1-2) UNRELEASED; urgency=low
 
   * Add upstream patch 01-crash-affine to fix a crash in affine due to relaxed
     constraints.
+  * Add upstream patch 02-crash-clipinfo-update to fix a crash in kdenlive when
+    a clip has no resource.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 06 Feb 2017 12:24:09 +0100
 
diff --git a/debian/patches/02-crash-clipinfo-update.diff b/debian/patches/02-crash-clipinfo-update.diff
new file mode 100644
index 0000000..3a89684
--- /dev/null
+++ b/debian/patches/02-crash-clipinfo-update.diff
@@ -0,0 +1,19 @@
+commit bf2749ab998446f13ba20c8cbc33a8c4d1c36963
+Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
+Date:   Sun Feb 5 22:54:50 2017 +0100
+
+    Fix crash in ClipInfo::update method when clip has no resource
+
+diff --git a/src/mlt++/MltPlaylist.cpp b/src/mlt++/MltPlaylist.cpp
+index 5676060..111d3f5 100644
+--- a/src/mlt++/MltPlaylist.cpp
++++ b/src/mlt++/MltPlaylist.cpp
+@@ -71,7 +71,7 @@ void ClipInfo::update( mlt_playlist_clip_info *info )
+ 	producer = new Producer( info->producer );
+ 	cut = new Producer( info->cut );
+ 	start = info->start;
+-	resource = strdup( info->resource );
++	resource = info->resource ? strdup( info->resource ) : 0;
+ 	frame_in = info->frame_in;
+ 	frame_out = info->frame_out;
+ 	frame_count = info->frame_count;
diff --git a/debian/patches/series b/debian/patches/series
index 2ee23c7..5a09da5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-crash-affine.diff
+02-crash-clipinfo-update.diff

-- 
MLT multimedia framework packaging