[SCM] vlc/lucid: Refresh security fix for 1.0.6.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Sat Jun 11 19:38:46 UTC 2011


The following commit has been merged in the lucid branch:
commit b22f62277b2332a275e6df28de0c18bcfb3aa69c
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 11 21:29:21 2011 +0200

    Refresh security fix for 1.0.6.

diff --git a/debian/patches/fix-xspf-integer-overflow.patch b/debian/patches/fix-xspf-integer-overflow.patch
index e40edbc..6ca649f 100644
--- a/debian/patches/fix-xspf-integer-overflow.patch
+++ b/debian/patches/fix-xspf-integer-overflow.patch
@@ -4,13 +4,13 @@ Origin: upstream, http://git.videolan.org/?p=vlc/vlc-1.1.git;a=commit;h=74d34b63
 
 --- a/modules/demux/playlist/xspf.c
 +++ b/modules/demux/playlist/xspf.c
-@@ -504,7 +504,8 @@
+@@ -517,7 +517,8 @@
                      }
                      free( psz_uri );
  
--                    if( p_sys->i_track_id < 0 )
-+                    if( p_sys->i_track_id < 0
-+                     || p_sys->i_track_id >= (SIZE_MAX / sizeof(p_new_input)) )
+-                    if( p_demux->p_sys->i_track_id < 0 )
++                    if( p_demux->p_sys->i_track_id < 0
++                     || p_demux->p_sys->i_track_id >= (SIZE_MAX / sizeof(p_new_input)) )
                      {
-                         input_item_node_AppendNode( p_input_node, p_new_node );
+                         input_item_AddSubItem( p_input_item, p_new_input );
                          vlc_gc_decref( p_new_input );

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list