[SCM] vlc/master: Fix heap corruption in MP4 demuxer

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 786433a1c920728c031e7b99031d635277b3d7b7
Author: Christophe Mutricy <xtophe at chewa.net>
Date:   Mon Apr 11 22:09:34 2011 +0100

    Fix heap corruption in MP4 demuxer
    
    Patch taken from upstream
    VideoLAN-SA-1103
    Thanks: Rémi Denis-Courmont

diff --git a/debian/patches/VideoLAN-SA-1103.patch b/debian/patches/VideoLAN-SA-1103.patch
new file mode 100644
index 0000000..666de28
--- /dev/null
+++ b/debian/patches/VideoLAN-SA-1103.patch
@@ -0,0 +1,17 @@
+Subject  MP4: fix heap-based buffer overflow
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commit;h=5637ca8141bf39f263ecdb62035d2cb45c740821
+
+diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
+index b6f860f..7eb900a 100644
+--- a/modules/demux/mp4/libmp4.c
++++ b/modules/demux/mp4/libmp4.c
+@@ -2247,7 +2247,7 @@ static int MP4_ReadBox_frma( stream_t *p_stream, MP4_Box_t *p_box )
+ 
+ static int MP4_ReadBox_skcr( stream_t *p_stream, MP4_Box_t *p_box )
+ {
+-    MP4_READBOX_ENTER( MP4_Box_data_frma_t );
++    MP4_READBOX_ENTER( MP4_Box_data_skcr_t );
+ 
+     MP4_GET4BYTES( p_box->data.p_skcr->i_init );
+     MP4_GET4BYTES( p_box->data.p_skcr->i_encr );
diff --git a/debian/patches/series b/debian/patches/series
index ac233f6..fe9a3eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 052_as-needed.patch
 200_osdmenu_paths.patch
 xulrunner-1.9.1.patch
+VideoLAN-SA-1103.patch

-- 
VLC media player packaging