Skip to content

V
vlc
Commit 2a8983fe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

SSA: do not use memmove 

Ref #7210
parent 0e519f71
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
modules/demux/subtitle.c
View file @ 2a8983fe
...@@ -1009,7 +1009,7 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, ...@@ -1009,7 +1009,7 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle,
{ {
const char *s = TextGetLine( txt ); const char *s = TextGetLine( txt );
int h1, m1, s1, c1, h2, m2, s2, c2; int h1, m1, s1, c1, h2, m2, s2, c2;
char *psz_text; char *psz_text, *psz_temp;
char temp[16]; char temp[16];
if( !s ) if( !s )
...@@ -1052,9 +1052,14 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle, ...@@ -1052,9 +1052,14 @@ static int ParseSSA( demux_t *p_demux, subtitle_t *p_subtitle,
int i_layer = ( p_sys->i_type == SUB_TYPE_ASS ) ? atoi( temp ) : 0; int i_layer = ( p_sys->i_type == SUB_TYPE_ASS ) ? atoi( temp ) : 0;
/* ReadOrder, Layer, %s(rest of fields) */ /* ReadOrder, Layer, %s(rest of fields) */
snprintf( temp, sizeof(temp), "%d,%d,", i_idx, i_layer ); if( asprintf( &psz_temp, "%d,%d,%s", i_idx, i_layer, psz_text ) == -1 )
memmove( psz_text + strlen(temp), psz_text, strlen(psz_text)+1 ); {
memcpy( psz_text, temp, strlen(temp) ); free( psz_text );
return VLC_ENOMEM;
}
free( psz_text );
psz_text = psz_temp;
} }
p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 + p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment