[vlc-commits] demux: asf: fix signedness in content desc

Francois Cartegnie git at videolan.org
Sat Dec 7 20:04:22 CET 2013


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Dec  7 19:59:41 2013 +0100| [3800e5d339388d1903d0aac5b00d90f6575a4732] | committer: Francois Cartegnie

demux: asf: fix signedness in content desc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3800e5d339388d1903d0aac5b00d90f6575a4732
---

 modules/demux/asf/libasf.c |    4 ++--
 modules/demux/asf/libasf.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 8b65635..aee2a80 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1159,7 +1159,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s,
                                         &p_obj->extended_content_description;
     const uint8_t *p_peek, *p_data;
     int i_peek;
-    int i;
+    uint16_t i;
 
     if( ( i_peek = stream_Peek( s, &p_peek, p_ec->i_object_size ) ) < 26 )
        return VLC_EGENERIC;
@@ -1258,7 +1258,7 @@ static void ASF_FreeObject_extended_content_description( asf_object_t *p_obj)
     asf_object_extended_content_description_t *p_ec =
                                         &p_obj->extended_content_description;
 
-    for( int i = 0; i < p_ec->i_count; i++ )
+    for( uint16_t i = 0; i < p_ec->i_count; i++ )
     {
         FREENULL( p_ec->ppsz_name[i] );
         FREENULL( p_ec->ppsz_value[i] );
diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 23ee3ca..c126356 100644
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -329,7 +329,7 @@ typedef struct
 {
     ASF_OBJECT_COMMON
 
-    int i_count;
+    uint16_t i_count;
     char **ppsz_name;
     char **ppsz_value;
 } asf_object_extended_content_description_t;



More information about the vlc-commits mailing list