Skip to content

V
vlc
Commit ab73f154 authored by Rémi Duraffort's avatar Rémi Duraffort Committed by Derk-Jan Hartman
Browse files
Options

Fix memleak (CID 213) 

(cherry picked from commit f7625a5d)
parent a023f153
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
modules/demux/subtitle.c
View file @ ab73f154
...@@ -1838,7 +1838,7 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1838,7 +1838,7 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
VLC_UNUSED( i_idx ); VLC_UNUSED( i_idx );
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
text_t *txt = &p_sys->txt; text_t *txt = &p_sys->txt;
char *psz_text; char *psz_text = NULL;
char psz_end[12]= "", psz_begin[12] = ""; char psz_end[12]= "", psz_begin[12] = "";
for( ;; ) for( ;; )
...@@ -1848,7 +1848,10 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1848,7 +1848,10 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
const char *s = TextGetLine( txt ); const char *s = TextGetLine( txt );
if( !s ) if( !s )
{
free( psz_text );
return VLC_EGENERIC; return VLC_EGENERIC;
}
psz_text = malloc( strlen( s ) + 1 ); psz_text = malloc( strlen( s ) + 1 );
if( !psz_text ) if( !psz_text )
...@@ -1888,8 +1891,11 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) ...@@ -1888,8 +1891,11 @@ static int ParseRealText( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
break; break;
} }
/* Line is not recognized */ /* Line is not recognized */
else continue; else
free( psz_text ); {
free( psz_text );
continue;
}
} }
/* Get the following Lines */ /* Get the following Lines */
......
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