r1111 - in /unstable/vlc/debian: changelog patches/105_min_mkv.patch patches/series

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

Author: xtophe-guest
Date: Sat Mar 29 15:06:13 2008
New Revision: 1111

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1111
Log:
Fix FTBS in mkv module

Added:
    unstable/vlc/debian/patches/105_min_mkv.patch
Modified:
    unstable/vlc/debian/changelog
    unstable/vlc/debian/patches/series

Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=1111&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Sat Mar 29 15:06:13 2008
@@ -1,10 +1,11 @@
-vlc (0.8.6.e-2) unstable; urgency=low
+vlc (0.8.6.e-2) unstable; urgency=high
 
   * Acknowledge NMU by Nico Golde. Thanks
   * New patch taken from upstream to fix an arbitrary code execution.
     CVE-2008-0073 (Closes: #473057)
-
- -- Christophe Mutricy <xtophe at videolan.org>  Fri, 28 Mar 2008 17:32:17 +0000
+  * New patch to fix FTBS in MKV module
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Sat, 29 Mar 2008 15:04:28 +0000
 
 vlc (0.8.6.e-1.1) unstable; urgency=high
 

Added: unstable/vlc/debian/patches/105_min_mkv.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/105_min_mkv.patch?rev=1111&op=file
==============================================================================
--- unstable/vlc/debian/patches/105_min_mkv.patch (added)
+++ unstable/vlc/debian/patches/105_min_mkv.patch Sat Mar 29 15:06:13 2008
@@ -1,0 +1,28 @@
+commit 8c55b82642441491f14486744abf6a145cd7d7db
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date:   Mon Feb 18 08:59:43 2008 +0000
+
+    MKV: use __MIN instead of min(
+
+diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
+index 65ed0fb..344fdb4 100644
+--- a/modules/demux/mkv.cpp
++++ b/modules/demux/mkv.cpp
+@@ -6035,7 +6035,7 @@ bool dvd_chapter_codec_c::Enter()
+             binary *p_data = (*index)->GetBuffer();
+             size_t i_size = *p_data++;
+             // avoid reading too much from the buffer
+-            i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
++            i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
+             for ( ; i_size > 0; i_size--, p_data += 8 )
+             {
+                 msg_Dbg( &sys.demuxer, "Matroska DVD enter command" );
+@@ -6058,7 +6058,7 @@ bool dvd_chapter_codec_c::Leave()
+             binary *p_data = (*index)->GetBuffer();
+             size_t i_size = *p_data++;
+             // avoid reading too much from the buffer
+-            i_size = min( i_size, ((*index)->GetSize() - 1) >> 3 );
++            i_size = __MIN( i_size, ((*index)->GetSize() - 1) >> 3 );
+             for ( ; i_size > 0; i_size--, p_data += 8 )
+             {
+                 msg_Dbg( &sys.demuxer, "Matroska DVD leave command" );

Modified: unstable/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/series?rev=1111&op=diff
==============================================================================
--- unstable/vlc/debian/patches/series (original)
+++ unstable/vlc/debian/patches/series Sat Mar 29 15:06:13 2008
@@ -4,6 +4,7 @@
 102_dejavu_font.diff
 103_kfreebsd.diff
 104_notify.diff
+105_min_mkv.patch
 200_osdmenu_paths.diff
 300_manpage_syntax.diff
 400-CVE-2008-1489.diff