Skip to content

V
vlc-1.1
Commit 3b73bdb1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Memory leak - fixes #2255

parent 33f87566
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
modules/misc/win32text.c
View file @ 3b73bdb1
...@@ -301,8 +301,10 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -301,8 +301,10 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
/* Sanity check */ /* Sanity check */
if( !p_region_in || !p_region_out ) return VLC_EGENERIC; if( !p_region_in || !p_region_out ) return VLC_EGENERIC;
#ifdef UNICODE
psz_string = malloc( (strlen( p_region_in->psz_text )+1) * sizeof(TCHAR) ); psz_string = malloc( (strlen( p_region_in->psz_text )+1) * sizeof(TCHAR) );
if( !psz_string )
return VLC_ENOMEM;
#ifdef UNICODE
if( mbstowcs( psz_string, p_region_in->psz_text, if( mbstowcs( psz_string, p_region_in->psz_text,
strlen( p_region_in->psz_text ) * sizeof(TCHAR) ) < 0 ) strlen( p_region_in->psz_text ) * sizeof(TCHAR) ) < 0 )
{ {
...@@ -310,9 +312,13 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -310,9 +312,13 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
#else #else
psz_string = strdup( p_region_in->psz_text ); strcpy( psz_string, p_region_in->psz_text );
#endif #endif
if( !psz_string || !*psz_string ) return VLC_EGENERIC; if( !*psz_string )
{
free( psz_strin );
return VLC_EGENERIC;
}
if( p_region_in->p_style ) if( p_region_in->p_style )
{ {
......
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