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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit fc2ff89a312f4ee56e9d6e614a4cd6cedd9f494e
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Apr 11 10:54:47 2018 +0200

    * Add upstream patch 04-rotoscoping-crash.
---
 debian/changelog                         |  6 ++++++
 debian/patches/04-rotoscoping-crash.diff | 22 ++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b6b406..910058b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mlt (6.6.0-3) UNRELEASED; urgency=medium
+
+  * Add upstream patch 04-rotoscoping-crash.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Apr 2018 10:54:32 +0200
+
 mlt (6.6.0-2) unstable; urgency=medium
 
   * Add upstream patch 01-qimage-segfault.
diff --git a/debian/patches/04-rotoscoping-crash.diff b/debian/patches/04-rotoscoping-crash.diff
new file mode 100644
index 0000000..a92c307
--- /dev/null
+++ b/debian/patches/04-rotoscoping-crash.diff
@@ -0,0 +1,22 @@
+commit 63966980c2e6dfa2550b0197d2d9c447ae7e326b
+Author: Vincent Pinon <vpinon at kde.org>
+Date:   Sat Apr 7 20:59:32 2018 +0200
+
+    Fix rotoscoping crash
+    
+    mlt_image_format_size surprisingly increases height by 1 line,
+    which causes memory copy out of source range.
+
+diff --git a/src/modules/plusgpl/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c
+index a7fae6d7..86041936 100644
+--- a/src/modules/plusgpl/filter_rotoscoping.c
++++ b/src/modules/plusgpl/filter_rotoscoping.c
+@@ -369,7 +369,7 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
+                 blur( map, *width, *height, feather, mlt_properties_get_int( unique, "feather_passes" ) );
+ 
+             int bpp;
+-            size = mlt_image_format_size( *format, *width, *height, &bpp );
++            size = mlt_image_format_size( *format, *width, *height - 1, &bpp ); // mlt_image_format_size increments height!
+             uint8_t *p = *image;
+             uint8_t *q = *image + size;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d00b944..0487e11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-qimage-segfault.diff
 02-qimage-crash.diff
 03-crash-kdenlivetile.diff
+04-rotoscoping-crash.diff

-- 
MLT multimedia framework packaging