Skip to content

V
vlc-2-2
Commit c7137692 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

dbus: fix file descriptors leak 

(cherry picked from commit 67aa058beb6ee58181c821ff217dfda1d5a36363)
parent 36c43ad4
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
modules/control/dbus/dbus.c
View file @ c7137692
...@@ -192,6 +192,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -192,6 +192,8 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_this, "Failed to connect to the D-Bus session daemon: %s", msg_Err( p_this, "Failed to connect to the D-Bus session daemon: %s",
error.message ); error.message );
dbus_error_free( &error ); dbus_error_free( &error );
close( p_sys->p_pipe_fds[1] );
close( p_sys->p_pipe_fds[0] );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -288,6 +290,8 @@ error: ...@@ -288,6 +290,8 @@ error:
vlc_mutex_destroy( &p_sys->lock ); vlc_mutex_destroy( &p_sys->lock );
close( p_sys->p_pipe_fds[1] );
close( p_sys->p_pipe_fds[0] );
free( p_sys ); free( p_sys );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
...@@ -339,6 +343,8 @@ static void Close ( vlc_object_t *p_this ) ...@@ -339,6 +343,8 @@ static void Close ( vlc_object_t *p_this )
vlc_array_destroy( p_sys->p_events ); vlc_array_destroy( p_sys->p_events );
vlc_array_destroy( p_sys->p_timeouts ); vlc_array_destroy( p_sys->p_timeouts );
vlc_array_destroy( p_sys->p_watches ); vlc_array_destroy( p_sys->p_watches );
close( p_sys->p_pipe_fds[1] );
close( p_sys->p_pipe_fds[0] );
free( p_sys ); free( p_sys );
} }
......
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