From c82dc29a9112f34e0a51cad9a412cf6d9d05dfb2 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 7 Sep 2011 13:44:45 -0500 Subject: iohandlers: fix issue with qemu_set_fd_handler() As spotted by Aneesh, some users pass a NULL opaque so we need to be more aggressive in checking whether a user means to unregister. Also fix a double free caused by tag not being reset to zero after delete. Signed-off-by: Anthony Liguori --- iohandler.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'iohandler.c') diff --git a/iohandler.c b/iohandler.c index 5ef66fb6e8..4cc1c5ade6 100644 --- a/iohandler.c +++ b/iohandler.c @@ -93,10 +93,6 @@ static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaq { IOTrampoline *tramp = opaque; - if (tramp->opaque == NULL) { - return FALSE; - } - if ((cond & G_IO_IN) && tramp->fd_read) { tramp->fd_read(tramp->opaque); } @@ -119,9 +115,10 @@ int qemu_set_fd_handler(int fd, if (tramp->tag != 0) { g_io_channel_unref(tramp->chan); g_source_remove(tramp->tag); + tramp->tag = 0; } - if (opaque) { + if (fd_read || fd_write || opaque) { GIOCondition cond = 0; tramp->fd_read = fd_read; -- cgit v1.2.1