X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fflac.c;h=d2fc0395b826fd234f87ab91451ab7274132f147;hb=132030acbbe9d9d69bed8e1382515a0060e9bf45;hp=5d3a63f1f4a1f983b4cc77a605d24604a8ec2055;hpb=57bbabb5e7c4b33141fdfbd811c78120e2401a9f;p=vlc

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 5d3a63f1f4..d2fc0395b8 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include <vlc_meta.h>
 #include <vlc_input.h>
@@ -44,7 +45,7 @@ static int  Open  ( vlc_object_t * );
 static void Close ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("FLAC demuxer") );
+    set_description( N_("FLAC demuxer") );
     set_capability( "demux", 155 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -99,7 +100,7 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    const byte_t *p_peek;
+    const uint8_t *p_peek;
     uint8_t     *p_streaminfo;
     int         i_streaminfo;
 
@@ -316,7 +317,7 @@ static int ControlSetTime( demux_t *p_demux, int64_t i_time )
                             (p_sys->seekpoint[i+1]->i_time_offset-p_sys->seekpoint[i]->i_time_offset);
 
     /* XXX We do exact seek if it's not too far away(45s) */
-    if( i_delta_time < 45*I64C(1000000) )
+    if( i_delta_time < 45*INT64_C(1000000) )
     {
         if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos ) )
             return VLC_EGENERIC;
@@ -462,7 +463,7 @@ static int  ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami
     /* */
     ParseStreamInfo( p_demux, &i_sample_rate, &i_sample_count,  *pp_streaminfo, *pi_streaminfo );
     if( i_sample_rate > 0 )
-        p_sys->i_length = i_sample_count * I64C(1000000)/i_sample_rate;
+        p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate;
 
     /* Be sure we have seekpoint 0 */
     s = vlc_seekpoint_New();
@@ -516,7 +517,7 @@ static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count,
     const int i_skip = 4+4;
 
     *pi_rate = GetDWBE(&p_data[i_skip+4+6]) >> 12;
-    *pi_count = GetQWBE(&p_data[i_skip+4+6]) &  ((I64C(1)<<36)-1);
+    *pi_count = GetQWBE(&p_data[i_skip+4+6]) &  ((INT64_C(1)<<36)-1);
 }
 
 static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
@@ -539,7 +540,7 @@ static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
             continue;
 
         s = vlc_seekpoint_New();
-        s->i_time_offset = i_sample * I64C(1000000)/i_sample_rate;
+        s->i_time_offset = i_sample * INT64_C(1000000)/i_sample_rate;
         s->i_byte_offset = GetQWBE( &p_data[4+18*i+8] );
 
         /* Check for duplicate entry */
@@ -619,7 +620,8 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
         if( oldval ) \
         { \
             char * newval; \
-            asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ); \
+            if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \
+                newval = NULL; \
             vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, newval ); \
             free( newval ); \
         } \
@@ -677,17 +679,17 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data )
 
     i_type = GetDWBE( p_data ); RM(4);
     i_len = GetDWBE( p_data ); RM(4);
-    if( i_data < i_len + 4 )
+    if( i_len < 0 || i_data < i_len + 4 )
         goto error;
     psz_mime = strndup( p_data, i_len ); RM(i_len);
     i_len = GetDWBE( p_data ); RM(4);
-    if( i_data < i_len + 4*4 + 4)
+    if( i_len < 0 || i_data < i_len + 4*4 + 4)
         goto error;
     psz_description = strndup( p_data, i_len ); RM(i_len);
     EnsureUTF8( psz_description );
     RM(4*4);
     i_len = GetDWBE( p_data ); RM(4);
-    if( i_len > i_data )
+    if( i_len < 0 || i_len > i_data )
         goto error;
 
     msg_Dbg( p_demux, "FLAC: Picture type=%d mime=%s description='%s' file length=%d",