#include <errno.h>
#include <sys/types.h>
+#include <limits.h>
#include <vlc_demux.h>
#include <vlc_charset.h>
static int Open ( vlc_object_t *p_this );
static void Close( vlc_object_t *p_this );
-vlc_module_begin();
- set_description( N_("Vobsub subtitles parser") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability( "demux", 1 );
+vlc_module_begin ()
+ set_description( N_("Vobsub subtitles parser") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability( "demux", 1 )
- set_callbacks( Open, Close );
+ set_callbacks( Open, Close )
- add_shortcut( "vobsub" );
- add_shortcut( "subtitle" );
-vlc_module_end();
+ add_shortcut( "vobsub" )
+ add_shortcut( "subtitle" )
+vlc_module_end ()
/*****************************************************************************
* Prototypes:
}
}
- asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path );
+ if( asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path ) == -1 )
+ {
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
i_len = strlen( psz_vobname );
if( i_len >= 4 ) memcpy( psz_vobname + i_len - 4, ".sub", 4 );
case DEMUX_GET_FPS:
case DEMUX_GET_META:
case DEMUX_GET_TITLE_INFO:
+ case DEMUX_HAS_UNSUPPORTED_META:
+ case DEMUX_GET_ATTACHMENTS:
+ case DEMUX_CAN_RECORD:
return VLC_EGENERIC;
default:
- msg_Err( p_demux, "unknown query in subtitle control" );
+ msg_Warn( p_demux, "unknown query in subtitle control" );
return VLC_EGENERIC;
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_maxdate;
- int i;
+ int i, i_read;
for( i = 0; i < p_sys->i_tracks; i++ )
{
if( tk.i_current_subtitle >= tk.i_subtitles )
continue;
- i_maxdate = (int64_t) p_sys->i_next_demux_date;
+ i_maxdate = p_sys->i_next_demux_date;
if( i_maxdate <= 0 && tk.i_current_subtitle < tk.i_subtitles )
{
/* Should not happen */
- i_maxdate = (int64_t) tk.p_subtitles[tk.i_current_subtitle].i_start + 1;
+ i_maxdate = tk.p_subtitles[tk.i_current_subtitle].i_start + 1;
}
while( tk.i_current_subtitle < tk.i_subtitles &&
}
/* read data */
- p_block->i_buffer = stream_Read( p_sys->p_vobsub_stream, p_block->p_buffer, i_size );
- if( p_block->i_buffer <= 6 )
+ i_read = stream_Read( p_sys->p_vobsub_stream, p_block->p_buffer, i_size );
+ if( i_read <= 6 )
{
block_Release( p_block );
tk.i_current_subtitle++;
continue;
}
+ p_block->i_buffer = i_read;
/* pts */
p_block->i_pts = tk.p_subtitles[tk.i_current_subtitle].i_start;
static int TextLoad( text_t *txt, stream_t *s )
{
- int i_line_max;
-
- /* init txt */
- i_line_max = 500;
- txt->i_line_count = 0;
- txt->i_line = 0;
- txt->line = calloc( i_line_max, sizeof( char * ) );
+ char **lines = NULL;
+ size_t n = 0;
/* load the complete file */
for( ;; )
{
char *psz = stream_ReadLine( s );
+ char **ppsz_new;
- if( psz == NULL )
+ if( psz == NULL || (n >= INT_MAX/sizeof(char *)) )
break;
- txt->line[txt->i_line_count++] = psz;
- if( txt->i_line_count >= i_line_max )
+ ppsz_new = realloc( lines, (n + 1) * sizeof (char *) );
+ if( ppsz_new == NULL )
{
- i_line_max += 100;
- txt->line = realloc( txt->line, i_line_max * sizeof( char*) );
+ free( psz );
+ break;
}
+ lines = ppsz_new;
+ lines[n++] = psz;
}
- if( txt->i_line_count <= 0 )
- {
- free( txt->line );
- return VLC_EGENERIC;
- }
+ txt->i_line_count = n;
+ txt->i_line = 0;
+ txt->line = lines;
return VLC_SUCCESS;
}
+
static void TextUnload( text_t *txt )
{
int i;
demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt;
char *line;
- vobsub_track_t *current_tk;
+ vobsub_track_t *current_tk = NULL;
for( ;; )
{
}
if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' )
+ {
continue;
+ }
else if( !strncmp( "size:", line, 5 ) )
{
/* Store the original size of the video */
language, &i_track_id ) == 2 )
{
p_sys->i_tracks++;
- p_sys->track = (vobsub_track_t*)realloc( p_sys->track, sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) );
+ p_sys->track = realloc( p_sys->track, sizeof( vobsub_track_t ) * (p_sys->i_tracks + 1 ) );
/* Init the track */
current_tk = &p_sys->track[p_sys->i_tracks - 1];
memset( current_tk, 0, sizeof( vobsub_track_t ) );
current_tk->i_current_subtitle = 0;
current_tk->i_subtitles = 0;
- current_tk->p_subtitles = (subtitle_t*)malloc( sizeof( subtitle_t ) );;
+ current_tk->p_subtitles = malloc( sizeof( subtitle_t ) );;
current_tk->i_track_id = i_track_id;
current_tk->i_delay = (int64_t)0;
int i_sign = 1;
int64_t i_start, i_location = 0;
- vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
-
- if( sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
+ if( p_sys->i_tracks > 0 &&
+ sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
&h, &count, &m, &s, &ms, &loc ) >= 5 )
{
+ vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
subtitle_t *current_sub;
if( line[count-3] == '-' )
i_location = loc;
current_tk->i_subtitles++;
- current_tk->p_subtitles = (subtitle_t*)realloc( current_tk->p_subtitles, sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) );
+ current_tk->p_subtitles = realloc( current_tk->p_subtitles, sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) );
current_sub = ¤t_tk->p_subtitles[current_tk->i_subtitles - 1];
- current_sub->i_start = (int64_t) i_start * i_sign;
+ current_sub->i_start = i_start * i_sign;
current_sub->i_start += current_tk->i_delay;
current_sub->i_vobsub_location = i_location;
}
+ else
+ {
+ msg_Warn( p_demux, "reading timestamp failed" );
+ }
}
else if( !strncasecmp( line, "delay:", 6 ) )
{
int i_sign = 1;
int64_t i_gap = 0;
- vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
-
- if( sscanf( line, "%*celay: %d%n:%d:%d:%d",
+ if( p_sys->i_tracks > 0 &&
+ sscanf( line, "%*celay: %d%n:%d:%d:%d",
&h, &count, &m, &s, &ms ) >= 4 )
{
+ vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
if( line[count-3] == '-' )
{
i_sign = -1;
i_sign, (long long)i_gap,
(long long)current_tk->i_delay );
}
+ else
+ {
+ msg_Warn( p_demux, "reading delay failed" );
+ }
}
}
return( 0 );
uint8_t *p_end = &p_bk->p_buffer[p_bk->i_buffer];
int i;
- while( p < p_end )
+ while( p + 6 < p_end )
{
int i_size = ps_pkt_size( p, p_end - p );
block_t *p_pkt;
int i_spu;
if( i_size <= 0 )
+ break;
+
+ if( i_size > p_end - p )
{
+ msg_Warn( p_demux, "broken PES size" );
break;
}
+
if( p[0] != 0 || p[1] != 0 || p[2] != 0x01 )
{
msg_Warn( p_demux, "invalid PES" );
for( i = 0; i < p_sys->i_tracks; i++ )
{
-#define tk p_sys->track[i]
+ vobsub_track_t *p_tk = &p_sys->track[i];
+
p_pkt->i_dts = p_pkt->i_pts = p_bk->i_pts;
p_pkt->i_length = 0;
- if( tk.p_es && tk.i_track_id == i_spu )
+ if( p_tk->p_es && p_tk->i_track_id == i_spu )
{
- es_out_Send( p_demux->out, tk.p_es, p_pkt );
+ es_out_Send( p_demux->out, p_tk->p_es, p_pkt );
p_bk->i_pts = 0; /*only first packet has a pts */
break;
}
- else if( i == p_sys->i_tracks - 1 )
- {
- block_Release( p_pkt );
- }
-#undef tk
+ }
+ if( i >= p_sys->i_tracks )
+ {
+ block_Release( p_pkt );
}
}
return VLC_SUCCESS;
}
+