[gentoo-commits] gentoo commit in src/patchsets/vlc/0.8.6i: 340_all_TTA-potential-0-divider.patch 350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch 360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch 370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch 380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch 390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch 400_all_Fix-previous-commits.patch series

[Alexis Ballier (aballier)]

aballier    08/08/22 08:55:31

  Modified:             series
  Added:                340_all_TTA-potential-0-divider.patch
                        350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch
                        360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch
                        370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch
                        380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch
                        390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch
                        400_all_Fix-previous-commits.patch
  Log:
  import upstream's tta fixes

Revision  Changes    Path
1.2                  src/patchsets/vlc/0.8.6i/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/series?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/series?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/series?r1=1.1&r2=1.2

Index: series
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/0.8.6i/series,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- series	13 Jul 2008 09:59:22 -0000	1.1
+++ series	22 Aug 2008 08:55:31 -0000	1.2
@@ -9,3 +9,10 @@
 250_all_livepic.patch
 290_all_altivec.patch
 330_all_libdca.patch
+340_all_TTA-potential-0-divider.patch
+350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch
+360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch
+370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch
+380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch
+390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch
+400_all_Fix-previous-commits.patch



1.1                  src/patchsets/vlc/0.8.6i/340_all_TTA-potential-0-divider.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/340_all_TTA-potential-0-divider.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/340_all_TTA-potential-0-divider.patch?rev=1.1&content-type=text/plain

Index: 340_all_TTA-potential-0-divider.patch
===================================================================
From c162cadb1a77262c72a181c7514f9d79b5946c46 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@××××××××××××.com>
Date: Wed, 20 Aug 2008 23:06:32 +0300
Subject: [PATCH] TTA: potential 0 divider
 (cherry picked from commit f789b29e0730f8c8e288517d1bd7956a8cfbb214)

---
 modules/demux/tta.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index e400908..47f83a4 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -111,6 +111,11 @@ static int Open( vlc_object_t * p_this )
     fmt.audio.i_channels = GetWLE( &p_header[6] );
     fmt.audio.i_bitspersample = GetWLE( &p_header[8] );
     fmt.audio.i_rate = GetDWLE( &p_header[10] );
+    if( fmt.audio.i_rate == 0 )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
 
     p_sys->i_datalength = GetDWLE( &p_header[14] );
     p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate;
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch?rev=1.1&content-type=text/plain

Index: 350_all_Check-malloc-return-value-and-fix-a-memory-leak.patch
===================================================================
From f51f8be0233e22114a0bb25ee1fcc9f4656ca5d7 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@××××××××××××.com>
Date: Thu, 21 Aug 2008 18:22:01 +0300
Subject: [PATCH] Check malloc return value and fix a memory leak.

(cherry picked from commit def276b7faa4b528f6171b7375ab432ee59357a0)

Conflicts:

	modules/demux/tta.c
---
 modules/demux/tta.c |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 47f83a4..a277fff 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -106,6 +106,9 @@ static int Open( vlc_object_t * p_this )
     p_demux->pf_control = Control;
     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
     
+    if( !p_sys )
+        return VLC_EGENERIC;
+
     /* Read the metadata */
     es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) );
     fmt.audio.i_channels = GetWLE( &p_header[6] );
@@ -126,8 +129,20 @@ static int Open( vlc_object_t * p_this )
 
     i_seektable_size = sizeof(uint32_t)*p_sys->i_totalframes;
     p_seektable = (uint8_t *)malloc( i_seektable_size );
+    if( !p_seektable )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
+
     stream_Read( p_demux->s, p_seektable, i_seektable_size );
-    p_sys->pi_seektable = (uint32_t *)malloc(i_seektable_size);
+    p_sys->pi_seektable = (uint32_t *)malloc( i_seektable_size );
+    if( !p_sys->pi_seektable )
+    {
+        free( p_seektable );
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
 
     for( i = 0; i < p_sys->i_totalframes; i++ )
         p_sys->pi_seektable[i] = GetDWLE( &p_seektable[i*4] );
@@ -137,8 +152,15 @@ static int Open( vlc_object_t * p_this )
     /* Store the header and Seektable for avcodec */
     fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4;
     fmt.p_extra = malloc( fmt.i_extra );
-    memcpy( fmt.p_extra, p_header, 22 );
-    memcpy( fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
+    if( !fmt.p_extra )
+    {
+        free( p_sys->pi_seektable );
+        free( p_seektable );
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
+    memcpy( (uint8_t*)fmt.p_extra, p_header, 22 );
+    memcpy( (uint8_t*)fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
 
     p_sys->p_es = es_out_Add( p_demux->out, &fmt );
     free( p_seektable );
@@ -167,6 +189,7 @@ static void Close( vlc_object_t * p_this )
     demux_t        *p_demux = (demux_t*)p_this;
     demux_sys_t    *p_sys = p_demux->p_sys;
 
+    free( p_sys->pi_seektable );
     free( p_sys );
 }
 
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch?rev=1.1&content-type=text/plain

Index: 360_all_Use-VLC_ENOMEM-instead-of-VLC_EGENERIC.patch
===================================================================
From 263a064acc3e48ddda9886061177f535aaf7f221 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@××××××××××××.com>
Date: Thu, 21 Aug 2008 18:23:55 +0300
Subject: [PATCH] Use VLC_ENOMEM instead of VLC_EGENERIC.

(cherry picked from commit c6a78e1b9e0cd1b87783b024f66ee440965053d5)

Not cherry-picked:

	modules/demux/rawvid.c
---
 modules/demux/tta.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index a277fff..5d8ff50 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -107,7 +107,7 @@ static int Open( vlc_object_t * p_this )
     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
     
     if( !p_sys )
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
 
     /* Read the metadata */
     es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) );
@@ -132,7 +132,7 @@ static int Open( vlc_object_t * p_this )
     if( !p_seektable )
     {
         free( p_sys );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
     stream_Read( p_demux->s, p_seektable, i_seektable_size );
@@ -141,7 +141,7 @@ static int Open( vlc_object_t * p_this )
     {
         free( p_seektable );
         free( p_sys );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
 
     for( i = 0; i < p_sys->i_totalframes; i++ )
@@ -157,7 +157,7 @@ static int Open( vlc_object_t * p_this )
         free( p_sys->pi_seektable );
         free( p_seektable );
         free( p_sys );
-        return VLC_EGENERIC;
+        return VLC_ENOMEM;
     }
     memcpy( (uint8_t*)fmt.p_extra, p_header, 22 );
     memcpy( (uint8_t*)fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch?rev=1.1&content-type=text/plain

Index: 370_all_TTA-robustify-and-avoid-one-memcpy-allocation.patch
===================================================================
From ed46352bb22249c36e3a44ea17ea91b29eed88ff Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@××××××××××××.com>
Date: Thu, 21 Aug 2008 18:29:09 +0300
Subject: [PATCH] TTA: robustify and avoid one memcpy/allocation

(cherry picked from commit db89ea7f1314cb0e1f0c07dfd6a5a3e4c417a63a)

Conflicts:

	modules/demux/tta.c
---
 modules/demux/tta.c |   69 +++++++++++++++++++++++---------------------------
 1 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 5d8ff50..9333381 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -60,8 +60,8 @@ struct demux_sys_t
     es_out_id_t *p_es;
 
     /* */
-    int      i_totalframes;
-    int      i_currentframe;
+    uint32_t i_totalframes;
+    uint32_t i_currentframe;
     uint32_t *pi_seektable;
     int      i_datalength;
     int      i_framelength;
@@ -81,8 +81,8 @@ static int Open( vlc_object_t * p_this )
     es_format_t fmt;
     uint8_t     *p_peek;
     uint8_t     p_header[22];
-    uint8_t     *p_seektable;
-    int         i_seektable_size = 0, i;
+    uint8_t     *p_fullheader;
+    int         i_seektable_size = 0;
     //char        psz_info[4096];
     //module_t    *p_id3;
 
@@ -109,16 +109,15 @@ static int Open( vlc_object_t * p_this )
     if( !p_sys )
         return VLC_ENOMEM;
 
+    p_sys->pi_seektable = NULL;
+
     /* Read the metadata */
     es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) );
     fmt.audio.i_channels = GetWLE( &p_header[6] );
     fmt.audio.i_bitspersample = GetWLE( &p_header[8] );
     fmt.audio.i_rate = GetDWLE( &p_header[10] );
     if( fmt.audio.i_rate == 0 )
-    {
-        free( p_sys );
-        return VLC_EGENERIC;
-    }
+        goto error;
 
     p_sys->i_datalength = GetDWLE( &p_header[14] );
     p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate;
@@ -126,44 +125,36 @@ static int Open( vlc_object_t * p_this )
     p_sys->i_totalframes = p_sys->i_datalength / p_sys->i_framelength + 
                           ((p_sys->i_datalength % p_sys->i_framelength) ? 1 : 0);
     p_sys->i_currentframe = 0;
+    if( p_sys->i_totalframes > (1 << 29))
+        goto error;
 
     i_seektable_size = sizeof(uint32_t)*p_sys->i_totalframes;
-    p_seektable = (uint8_t *)malloc( i_seektable_size );
-    if( !p_seektable )
-    {
-        free( p_sys );
-        return VLC_ENOMEM;
-    }
 
-    stream_Read( p_demux->s, p_seektable, i_seektable_size );
-    p_sys->pi_seektable = (uint32_t *)malloc( i_seektable_size );
+    /* Store the header and Seektable for avcodec */
+    fmt.i_extra = 22 + i_seektable_size + 4;
+    fmt.p_extra = p_fullheader = malloc( fmt.i_extra );
+    if( !p_fullheader )
+        goto error;
+
+    memcpy( p_fullheader, p_header, 22 );
+    p_fullheader += 22;
+    if( stream_Read( p_demux->s, p_fullheader, i_seektable_size )
+             != i_seektable_size )
+        goto error;
+
+    p_sys->pi_seektable = calloc( p_sys->i_totalframes, sizeof(uint32_t) );
     if( !p_sys->pi_seektable )
+        goto error;
+    for( uint32_t i = 0; i < p_sys->i_totalframes; i++ )
     {
-        free( p_seektable );
-        free( p_sys );
-        return VLC_ENOMEM;
+        p_sys->pi_seektable[i] = GetDWLE( p_fullheader );
+        p_fullheader += 4;
     }
 
-    for( i = 0; i < p_sys->i_totalframes; i++ )
-        p_sys->pi_seektable[i] = GetDWLE( &p_seektable[i*4] );
-
-    stream_Read( p_demux->s, NULL, 4 ); /* CRC */
-
-    /* Store the header and Seektable for avcodec */
-    fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4;
-    fmt.p_extra = malloc( fmt.i_extra );
-    if( !fmt.p_extra )
-    {
-        free( p_sys->pi_seektable );
-        free( p_seektable );
-        free( p_sys );
-        return VLC_ENOMEM;
-    }
-    memcpy( (uint8_t*)fmt.p_extra, p_header, 22 );
-    memcpy( (uint8_t*)fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
+    stream_Read( p_demux->s, p_fullheader, 4 ); /* CRC */
+    p_fullheader += 4;
 
     p_sys->p_es = es_out_Add( p_demux->out, &fmt );
-    free( p_seektable );
     p_sys->i_start = stream_Tell( p_demux->s );
     
 #if 0
@@ -179,6 +170,10 @@ static int Open( vlc_object_t * p_this )
         p_sys->p_meta = vlc_meta_New();
 #endif
     return VLC_SUCCESS;
+error:
+    es_format_Clean( &fmt );
+    Close( p_this );
+    return VLC_EGENERIC;
 }
 
 /*****************************************************************************
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch?rev=1.1&content-type=text/plain

Index: 380_all_TTA-Sanity-check-to-avoid-overflow-and-typo.patch
===================================================================
From f4b2033653fedef4912c1e473608ff92fbb6d9fe Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@××××××××.org>
Date: Wed, 20 Aug 2008 13:56:05 -0700
Subject: [PATCH] TTA: Sanity check to avoid overflow and typo
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

i_rate can go up to 2^32-1.
If you * 1.044 it is going to not fit in a int (_framelength)
(cherry picked from commit d487b81dde82b458dd6ffe6cb73aa798d6b0b855)

Signed-off-by: Rémi Denis-Courmont <rdenis@××××××××××××.com>
---
 modules/demux/tta.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 9333381..4abca25 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -94,7 +94,7 @@ static int Open( vlc_object_t * p_this )
         if( !p_demux->b_force ) return VLC_EGENERIC;
 
         /* User forced */
-        msg_Err( p_demux, "this doesn't look like a flac stream, "
+        msg_Err( p_demux, "this doesn't look like a true-audio stream, "
                  "continuing anyway" );
     }
 
@@ -116,8 +116,12 @@ static int Open( vlc_object_t * p_this )
     fmt.audio.i_channels = GetWLE( &p_header[6] );
     fmt.audio.i_bitspersample = GetWLE( &p_header[8] );
     fmt.audio.i_rate = GetDWLE( &p_header[10] );
-    if( fmt.audio.i_rate == 0 )
+    if( fmt.audio.i_rate == 0 || /* Avoid divide by 0 */
+        fmt.audio.i_rate > ( 1 << 20 ) /* Avoid i_framelength overflow */ )
+    {
+        msg_Warn( p_demux, "Wrong sample rate" );
         goto error;
+    }
 
     p_sys->i_datalength = GetDWLE( &p_header[14] );
     p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate;
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch?rev=1.1&content-type=text/plain

Index: 390_all_Kill-a-warning-and-put-i_datalength-as-an-uint32_t.patch
===================================================================
From edafd8deaea0089e020e10b7255a88a3fc975441 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@××××××××.org>
Date: Wed, 20 Aug 2008 14:09:27 -0700
Subject: [PATCH] Kill a warning and put i_datalength as an uint32_t
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5fff76145c2ad523334cc15432f458f1940ed895)

Signed-off-by: Rémi Denis-Courmont <rdenis@××××××××××××.com>
---
 modules/demux/tta.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 4abca25..1522854 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -63,7 +63,7 @@ struct demux_sys_t
     uint32_t i_totalframes;
     uint32_t i_currentframe;
     uint32_t *pi_seektable;
-    int      i_datalength;
+    uint32_t i_datalength;
     int      i_framelength;
 
     /* */
@@ -248,7 +248,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             if( i64 > 0 )
             {
                 int64_t tmp = 0;
-                int     i;
+                uint32_t i;
                 for( i=0; i < p_sys->i_totalframes && tmp+p_sys->pi_seektable[i] < i64; i++)
                 {
                     tmp += p_sys->pi_seektable[i];
-- 
1.5.6.5




1.1                  src/patchsets/vlc/0.8.6i/400_all_Fix-previous-commits.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/400_all_Fix-previous-commits.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6i/400_all_Fix-previous-commits.patch?rev=1.1&content-type=text/plain

Index: 400_all_Fix-previous-commits.patch
===================================================================
From cf8158787e1442a4adad7250edbb30779cb18442 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@××××××××××××.com>
Date: Thu, 21 Aug 2008 18:37:52 +0300
Subject: [PATCH] Fix previous commits

---
 modules/demux/tta.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 1522854..eede5bb 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -85,6 +85,7 @@ static int Open( vlc_object_t * p_this )
     int         i_seektable_size = 0;
     //char        psz_info[4096];
     //module_t    *p_id3;
+    uint32_t    i;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
         return VLC_EGENERIC;
@@ -149,7 +150,7 @@ static int Open( vlc_object_t * p_this )
     p_sys->pi_seektable = calloc( p_sys->i_totalframes, sizeof(uint32_t) );
     if( !p_sys->pi_seektable )
         goto error;
-    for( uint32_t i = 0; i < p_sys->i_totalframes; i++ )
+    for( i = 0; i < p_sys->i_totalframes; i++ )
     {
         p_sys->pi_seektable[i] = GetDWLE( p_fullheader );
         p_fullheader += 4;
-- 
1.5.6.5