[Spice-devel] [PATCH spice-server] main-dispatcher: Remove watch leak

[Christophe Fergeau]

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

On Wed, Mar 01, 2017 at 05:09:54PM +0000, Frediano Ziglio wrote:
> Watch was added but never removed.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/main-dispatcher.c | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/server/main-dispatcher.c b/server/main-dispatcher.c
> index 09ac1cc..51d6004 100644
> --- a/server/main-dispatcher.c
> +++ b/server/main-dispatcher.c
> @@ -55,6 +55,7 @@ struct MainDispatcherPrivate
>  {
>      SpiceCoreInterfaceInternal *core; /* weak */
>      RedsState *reds; /* weak */
> +    SpiceWatch *watch;
>  };
>  
>  
> @@ -105,6 +106,7 @@ main_dispatcher_set_property(GObject      *object,
>  }
>  
>  static void main_dispatcher_constructed(GObject *object);
> +static void main_dispatcher_finalize(GObject *object);
>  
>  static void
>  main_dispatcher_class_init(MainDispatcherClass *klass)
> @@ -114,6 +116,7 @@ main_dispatcher_class_init(MainDispatcherClass *klass)
>      g_type_class_add_private(klass, sizeof(MainDispatcherPrivate));
>  
>      object_class->constructed = main_dispatcher_constructed;
> +    object_class->finalize = main_dispatcher_finalize;
>      object_class->get_property = main_dispatcher_get_property;
>      object_class->set_property = main_dispatcher_set_property;
>  
> @@ -304,10 +307,11 @@ void main_dispatcher_constructed(GObject *object)
>      G_OBJECT_CLASS(main_dispatcher_parent_class)->constructed(object);
>      dispatcher_set_opaque(DISPATCHER(self), self);
>  
> -    self->priv->core->watch_add(self->priv->core,
> -                                dispatcher_get_recv_fd(DISPATCHER(self)),
> -                                SPICE_WATCH_EVENT_READ, dispatcher_handle_read,
> -                                self);
> +    self->priv->watch =
> +        self->priv->core->watch_add(self->priv->core,
> +                                    dispatcher_get_recv_fd(DISPATCHER(self)),
> +                                    SPICE_WATCH_EVENT_READ, dispatcher_handle_read,
> +                                    self);
>      dispatcher_register_handler(DISPATCHER(self), MAIN_DISPATCHER_CHANNEL_EVENT,
>                                  main_dispatcher_handle_channel_event,
>                                  sizeof(MainDispatcherChannelEventMessage), 0 /* no ack */);
> @@ -321,3 +325,11 @@ void main_dispatcher_constructed(GObject *object)
>                                  main_dispatcher_handle_client_disconnect,
>                                  sizeof(MainDispatcherClientDisconnectMessage), 0 /* no ack */);
>  }
> +
> +static void main_dispatcher_finalize(GObject *object)
> +{
> +    MainDispatcher *self = MAIN_DISPATCHER(object);
> +
> +    self->priv->core->watch_remove(self->priv->core, self->priv->watch);
> +    self->priv->watch = NULL;
> +}
> -- 
> 2.9.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170302/1557b2bb/attachment.sig>