[SCM] VLC media player packaging branch, lenny, updated. debian/0.8.6.h-4+lenny2-8-gcf42840

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

The following commit has been merged in the lenny branch:
commit ae5b697ad0e9284ba9212e3f18f87674bb9a6575
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Mar 18 17:03:18 2010 +0100

    Avoid integer overflow

diff --git a/debian/patches/411-VideoLAN-SA-0901.diff b/debian/patches/411-VideoLAN-SA-0901.diff
index 9d0b24c..1ffe565 100644
--- a/debian/patches/411-VideoLAN-SA-0901.diff
+++ b/debian/patches/411-VideoLAN-SA-0901.diff
@@ -43,7 +43,7 @@ index 4f26a31..ee50cd2 100644
      psz_name = ASF_ObjectDumpDebugInfo[i].psz_name;
  
 +    char str[512];
-+    if( i_level * 5 + 1 >= sizeof(str) )
++    if( i_level >= (sizeof(str) - 1)/5 )
 +        return;
 +
      memset( str, ' ', sizeof( str ) );
@@ -75,7 +75,7 @@ index 6133741..14f495d 100644
      avi_chunk_t *p_child;
  
 +    char str[512];
-+    if( i_level * 5 + 1 >= sizeof(str) )
++    if( i_level >= (sizeof(str) - 1)/5 )
 +        return;
 +
      memset( str, ' ', sizeof( str ) );
@@ -116,7 +116,7 @@ index 61ca9f3..f32e8df 100644
 -        memset( str, (uint8_t)' ', 512 );
 +
 +        char str[512];
-+        if( i_level * 5 + 1 >= sizeof(str) )
++        if( i_level >= (sizeof(str) - 1)/5 )
 +            return;
 +
 +        memset( str, ' ', sizeof(str) );

-- 
VLC media player packaging