[SCM] vlc/master: Apply upstream patch for CVE-2015-5949

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9cdcc35a93cf719b6836cbe2f0d29eeb1757dbbf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Aug 21 08:20:00 2015 +0200

    Apply upstream patch for CVE-2015-5949

diff --git a/debian/patches/demux-mp4-correctly-match-release-function.patch b/debian/patches/demux-mp4-correctly-match-release-function.patch
new file mode 100644
index 0000000..751482c
--- /dev/null
+++ b/debian/patches/demux-mp4-correctly-match-release-function.patch
@@ -0,0 +1,29 @@
+From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcartegnie at free.fr>
+Date: Mon, 3 Aug 2015 15:17:32 +0200
+Subject: [PATCH 1/1] demux: mp4: correctly match release function
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/demux/mp4/libmp4.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
+index 331262b..f220e51 100644
+--- a/modules/demux/mp4/libmp4.c
++++ b/modules/demux/mp4/libmp4.c
+@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
+     {
+         for( i_index = 0; ; i_index++ )
+         {
++            if ( MP4_Box_Function[i_index].i_parent &&
++                 p_box->p_father &&
++                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
++                continue;
++
+             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
+                 ( MP4_Box_Function[i_index].i_type == 0 ) )
+             {
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed6ed97
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+demux-mp4-correctly-match-release-function.patch

-- 
VLC media player packaging