Skip to content

V
vlc-gpu
Commit f103a7c2 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed double frees in libvlc_audio_output_device_longname/id.

parent a5429b61
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
src/control/audio.c
View file @ f103a7c2
...@@ -199,10 +199,11 @@ char * libvlc_audio_output_device_longname( libvlc_instance_t *p_instance, ...@@ -199,10 +199,11 @@ char * libvlc_audio_output_device_longname( libvlc_instance_t *p_instance,
VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL ); VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL );
free( val.psz_string ); free( val.psz_string );
} }
free( psz_config_name );
if( i_device >= 0 && i_device < p_module_config->i_list ) if( i_device >= 0 && i_device < p_module_config->i_list )
{ {
free( psz_config_name );
if( p_module_config->ppsz_list_text[i_device] ) if( p_module_config->ppsz_list_text[i_device] )
return strdup( p_module_config->ppsz_list_text[i_device] ); return strdup( p_module_config->ppsz_list_text[i_device] );
else else
...@@ -242,11 +243,12 @@ char * libvlc_audio_output_device_id( libvlc_instance_t *p_instance, ...@@ -242,11 +243,12 @@ char * libvlc_audio_output_device_id( libvlc_instance_t *p_instance,
VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL ); VLC_OBJECT( p_instance->p_libvlc_int ), psz_config_name, val, val, NULL );
free( val.psz_string ); free( val.psz_string );
} }
free( psz_config_name );
if( i_device >= 0 && i_device < p_module_config->i_list ) if( i_device >= 0 && i_device < p_module_config->i_list )
{
free( psz_config_name );
return strdup( p_module_config->ppsz_list[i_device] ); return strdup( p_module_config->ppsz_list[i_device] );
}
} }
free( psz_config_name ); free( psz_config_name );
......
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