Commit 74753c48 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Mem leaks

parent 2bd41c43
...@@ -508,6 +508,8 @@ void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item ) ...@@ -508,6 +508,8 @@ void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item )
char *psz_author = vlc_input_item_GetInfo( &p_item->input, char *psz_author = vlc_input_item_GetInfo( &p_item->input,
_("Meta-information"), _("Meta-information"),
_("Artist")); _("Artist"));
if( psz_author == NULL )
return;
char psz_duration[MSTRTIME_MAX_SIZE]; char psz_duration[MSTRTIME_MAX_SIZE];
mtime_t dur = p_item->input.i_duration; mtime_t dur = p_item->input.i_duration;
...@@ -527,6 +529,7 @@ void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item ) ...@@ -527,6 +529,7 @@ void Playlist::UpdateTreeItem( playlist_t *p_playlist, wxTreeItemId item )
msg.Printf( wxString(wxU( psz_author )) + wxT(" - ") + msg.Printf( wxString(wxU( psz_author )) + wxT(" - ") +
wxString(wxU(p_item->input.psz_name)) + duration ); wxString(wxU(p_item->input.psz_name)) + duration );
} }
free( psz_author );
treectrl->SetItemText( item , msg ); treectrl->SetItemText( item , msg );
treectrl->SetItemImage( item, p_item->input.i_type ); treectrl->SetItemImage( item, p_item->input.i_type );
......
...@@ -102,6 +102,7 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist, ...@@ -102,6 +102,7 @@ int playlist_ServicesDiscoveryRemove( playlist_t * p_playlist,
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
p_sd->b_die = VLC_TRUE; p_sd->b_die = VLC_TRUE;
vlc_thread_join( p_sd ); vlc_thread_join( p_sd );
free( p_sd->psz_module );
module_Unneed( p_sd, p_sd->p_module ); module_Unneed( p_sd, p_sd->p_module );
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
vlc_object_destroy( p_sd ); vlc_object_destroy( p_sd );
......
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