[virt-tools-list] [virt-viewer v2 13/13] events: don't leak GIOChannel when destroying IO handle
Fabiano Fidêncio
fidencio at redhat.com
Wed Jul 22 08:04:40 UTC 2015
virt_viewer_events_add_handle() creates a GIOChannel in order to watch the
fd it was given for changes.
virt_viewer_events_remove_handle() is freeing all the resources allocated by
virt_viewer_events_add_handle() except for this GIOChannel. This commit adds
the needed g_io_channel_unref() call to virt_viewer_events_remove_handle()
Based on commit 8e95b8d25a3eee6316aff2f83b0c449aaf10984a from
libvirt-glib.
Original author: Christophe Fergeau <cfergeau at redhat.com>
Related to: rhbz#1243228
---
src/virt-viewer-events.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/virt-viewer-events.c b/src/virt-viewer-events.c
index 44740c3..9636e3e 100644
--- a/src/virt-viewer-events.c
+++ b/src/virt-viewer-events.c
@@ -239,6 +239,10 @@ virt_viewer_events_remove_handle(int watch)
data->events = 0;
}
+ g_warn_if_fail(data->channel != NULL);
+ g_io_channel_unref(data->channel);
+ data->channel = NULL;
+
/* since the actual watch deletion is done asynchronously, a update_handle call may
* reschedule the watch before it's fully deleted, that's why we need to mark it as
* 'removed' to prevent reuse
--
2.4.4
More information about the virt-tools-list
mailing list