[Spice-devel,v5,2/8] Free inputs_channel in spice_server_destroy

Submitted by Frediano Ziglio on Dec. 5, 2016, 12:16 p.m.

Details

Message ID c5f9b1daf4b1e33e6a213d318972f850ea95120a.1480940153.git-series.fziglio@redhat.com
State Accepted
Headers show
Series "Start cleaning objects on destruction" ( rev: 7 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio Dec. 5, 2016, 12:16 p.m.
Avoid leaking this channel.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 server/reds.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch hide | download patch | download mbox

diff --git a/server/reds.c b/server/reds.c
index 479a815..17e5ada 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3592,6 +3592,10 @@  SPICE_GNUC_VISIBLE void spice_server_destroy(SpiceServer *reds)
     servers = g_list_remove(servers, reds);
     pthread_mutex_unlock(&global_reds_lock);
 
+    if (reds->inputs_channel) {
+        reds_unregister_channel(reds, RED_CHANNEL(reds->inputs_channel));
+        red_channel_destroy(RED_CHANNEL(reds->inputs_channel));
+    }
     if (reds->main_channel) {
         red_channel_destroy(RED_CHANNEL(reds->main_channel));
     }

Comments

Acked-by: Jonathon Jongsma <jjongsma@redhat.com>


On Mon, 2016-12-05 at 12:16 +0000, Frediano Ziglio wrote:
> Avoid leaking this channel.
> 
> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
> ---
>  server/reds.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/server/reds.c b/server/reds.c
> index 479a815..17e5ada 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -3592,6 +3592,10 @@ SPICE_GNUC_VISIBLE void
> spice_server_destroy(SpiceServer *reds)
>      servers = g_list_remove(servers, reds);
>      pthread_mutex_unlock(&global_reds_lock);
>  
> +    if (reds->inputs_channel) {
> +        reds_unregister_channel(reds, RED_CHANNEL(reds-
> >inputs_channel));
> +        red_channel_destroy(RED_CHANNEL(reds->inputs_channel));
> +    }
>      if (reds->main_channel) {
>          red_channel_destroy(RED_CHANNEL(reds->main_channel));
>      }