Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package mlt
It adds two upstream patches to fix crashes of kdenlive/mlt.
diff --git a/debian/changelog b/debian/changelog
index f423448..378dc92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mlt (6.4.1-2) unstable; 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 <pmatth...@debian.org> Tue, 07 Feb 2017 13:13:57 +0100
+
mlt (6.4.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/01-crash-affine.diff
b/debian/patches/01-crash-affine.diff
new file mode 100644
index 0000000..ba13782
--- /dev/null
+++ b/debian/patches/01-crash-affine.diff
@@ -0,0 +1,40 @@
+commit ab626f7543e0498e3ca3842ba69ad2f2e66ce227
+Author: Dan Dennedy <d...@dennedy.org>
+Date: Sun Jan 29 00:43:28 2017 -0800
+
+ Fix crash in affine due to relaxed constraints.
+
+diff --git a/src/modules/plus/transition_affine.c
b/src/modules/plus/transition_affine.c
+index 8c8820e..91607fd 100644
+--- a/src/modules/plus/transition_affine.c
++++ b/src/modules/plus/transition_affine.c
+@@ -1,6 +1,6 @@
+ /*
+ * transition_affine.c -- affine transformations
+- * Copyright (C) 2003-2016 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -552,8 +552,8 @@ static int transition_get_image( mlt_frame a_frame,
uint8_t **image, mlt_image_f
+
+ // Affine boundaries
+ float minima = 0;
+- float xmax = b_width;
+- float ymax = b_height;
++ float xmax = b_width - 1;
++ float ymax = b_height - 1;
+
+ // Set the interpolation function
+ if ( interps == NULL || strcmp( interps, "nearest" ) == 0 ||
strcmp( interps, "neighbor" ) == 0 || strcmp( interps, "tiles" ) == 0 ||
strcmp( interps, "fast_bilinear" ) == 0 )
+@@ -567,9 +567,7 @@ static int transition_get_image( mlt_frame a_frame,
uint8_t **image, mlt_image_f
+ else if ( strcmp( interps, "bilinear" ) == 0 )
+ {
+ interp = interpBL_b32;
+- // uses floorf. Values should be >= 0 and < max + 1.
+- xmax += 0.99;
+- ymax += 0.99;
++ // uses floorf.
+ }
+ else if ( strcmp( interps, "bicubic" ) == 0 || strcmp(
interps, "hyper" ) == 0 || strcmp( interps, "sinc" ) == 0 || strcmp( interps,
"lanczos" ) == 0 || strcmp( interps, "spline" ) == 0 )
+ {
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 <j...@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
new file mode 100644
index 0000000..5a09da5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-crash-affine.diff
+02-crash-clipinfo-update.diff
unblock mlt/6.4.1-2
-- System Information:
Debian Release: 8.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
