]> git.sesse.net Git - vlc/blobdiff - modules/demux/real.c
avformat: set the "duration/length/ of a packet if known.
[vlc] / modules / demux / real.c
index 36084c689c036b253293e9ea6162d86104f22dc7..0960c4cddb4ef21dfe62845127227f13276a0a53 100644 (file)
@@ -66,7 +66,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( N_("Real demuxer" ) );
-    set_capability( "demux", 15 );
+    set_capability( "demux", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
@@ -269,7 +269,8 @@ static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     uint8_t     header[18];
-    int         i_size, i_id, i_flags, i;
+    int         i_id, i_flags, i;
+    unsigned int i_size;
     int64_t     i_pts;
     real_track_t *tk = NULL;
     bool  b_selected;
@@ -310,6 +311,18 @@ static int Demux( demux_t *p_demux )
 
     p_sys->i_data_packets++;
 
+    if( i_size == 0 )
+    {
+        msg_Err( p_demux, "Got a NUKK size to read. (Invalid format?)" );
+        return 1;
+    }
+
+    if( i_size > sizeof(p_sys->buffer) )
+    {
+        msg_Err( p_demux, "Got a size to read bigger than our buffer. (Invalid format?)" );
+        return 1;
+    }
+
     stream_Read( p_demux->s, p_sys->buffer, i_size );
 
     for( i = 0; i < p_sys->i_track; i++ )