Commit e8d92460 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

video_text: Fix a bad vasprintf usage.

parent 8709c035
...@@ -127,7 +127,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel, ...@@ -127,7 +127,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
const char *psz_format, ... ) const char *psz_format, ... )
{ {
vout_thread_t *p_vout; vout_thread_t *p_vout;
char *psz_string; char *psz_string = NULL;
va_list args; va_list args;
if( !config_GetInt( p_caller, "osd" ) ) return; if( !config_GetInt( p_caller, "osd" ) ) return;
...@@ -136,17 +136,17 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel, ...@@ -136,17 +136,17 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
if( p_vout ) if( p_vout )
{ {
va_start( args, psz_format ); va_start( args, psz_format );
vasprintf( &psz_string, psz_format, args ); if( vasprintf( &psz_string, psz_format, args ) != -1 )
{
vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL, vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL,
OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, OSD_ALIGN_TOP|OSD_ALIGN_RIGHT,
30 + p_vout->fmt_in.i_width 30 + p_vout->fmt_in.i_width
- p_vout->fmt_in.i_visible_width - p_vout->fmt_in.i_visible_width
- p_vout->fmt_in.i_x_offset, - p_vout->fmt_in.i_x_offset,
20 + p_vout->fmt_in.i_y_offset, 1000000 ); 20 + p_vout->fmt_in.i_y_offset, 1000000 );
free( psz_string );
}
vlc_object_release( p_vout ); vlc_object_release( p_vout );
free( psz_string );
va_end( args ); va_end( args );
} }
} }
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