]> git.sesse.net Git - vlc/commitdiff
Fix sizeof mismatch (cid #1049614 and #1049613-12)
authorRémi Duraffort <ivoire@videolan.org>
Fri, 19 Jul 2013 19:03:57 +0000 (21:03 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Fri, 19 Jul 2013 19:07:22 +0000 (21:07 +0200)
modules/demux/mkv/mkv.cpp
modules/demux/ogg.c

index 7dc7e25469ffdfd967d9bc6ebf3ed6c1673ce6bd..890fde664133c449229b1429eaf43e7dc0b06c05 100644 (file)
@@ -354,7 +354,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 int *pi_int    = (int*)va_arg( args, int* );
 
                 *pi_int = p_sys->titles.size();
-                *ppp_title = (input_title_t**)malloc( sizeof( input_title_t**) * p_sys->titles.size() );
+                *ppp_title = (input_title_t**)malloc( sizeof( input_title_t* ) * p_sys->titles.size() );
 
                 for( size_t i = 0; i < p_sys->titles.size(); i++ )
                     (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->titles[i] );
index d9312e8b5d399f155b5358f7ef7da95c2b066895..7d9aa3546d43562fb57f8d278f5200c12db894f5 100644 (file)
@@ -505,7 +505,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 return VLC_EGENERIC;
 
             *pi_int = p_sys->i_attachments;
-            *ppp_attach = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+            *ppp_attach = xmalloc( sizeof(input_attachment_t*) * p_sys->i_attachments );
             for( int i = 0; i < p_sys->i_attachments; i++ )
                 (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
             return VLC_SUCCESS;
@@ -541,7 +541,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             if( p_sys->i_seekpoints > 0 )
             {
                 *pi_int = 1;
-                *ppp_title = malloc( sizeof( input_title_t**) );
+                *ppp_title = malloc( sizeof( input_title_t* ) );
                 input_title_t *p_title = (*ppp_title)[0] = vlc_input_title_New();
                 for( int i = 0; i < p_sys->i_seekpoints; i++ )
                 {