Avoid integer overflow

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 65b05b01d55c12c28d08946d56bb7a9f6c1efc46..803c849b18a4c43967ffd1bb9f9fd7465916a208 100644 (file)
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1487,7 +1487,7 @@ static void ASF_ObjectDumpDebug( vlc_object_t *p_obj,
     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 ) );

diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 9f857d867929de6be2f32db4473884b1a489100c..45d20e2b43d20c451b1f6abcd54ad8787c65b92a 100644 (file)
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -803,7 +803,7 @@ static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj,
     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 ) );

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 9a92934d8dd6a7f8613b2197abbd25bc00b68886..c84b74efd9b75ea948399f422743677538a62f80 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2895,7 +2895,7 @@ static void __MP4_BoxDumpStructure( stream_t *s,
         unsigned int i;
 
         char str[512];
-        if( i_level * 5 + 1 >= sizeof(str) )
+        if( i_level >= (sizeof(str) - 1)/5 )
             return;
 
         memset( str, ' ', sizeof(str) );