OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-char: Set foo_tag = 0 when returning FALSE from callbacks

Browse Source 
While reviewing some patches I found this problem where tcp_chr_accept
does not clear listen_tag when returning FALSE, leading to a double
g_source_remove of the underlying source. Not really a problem unless the id
gets re-used in between, but still something we should fix.

While at it I've also reviewed all the other code in qemu-char.c for
similar problems and found that pty_chr_timer has the same problem.

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Message-id: 1366890782-10311-1-git-send-email-hdegoede@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hans de Goede 2013-04-25 13:53:02 +02:00 committed by Anthony Liguori
parent e4dcd8ace1
commit 79f2007578
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu-char.c
View File

@ -1077,6 +1077,7 @@ static gboolean pty_chr_timer(gpointer opaque)
pty_chr_update_read_handler(chr); pty_chr_update_read_handler(chr);
out: out:
s->timer_tag = 0;
return FALSE; return FALSE;
} }
@ -2642,6 +2643,7 @@ static gboolean tcp_chr_accept(GIOChannel *channel, GIOCondition cond, void *opa
} }
fd = qemu_accept(s->listen_fd, addr, &len); fd = qemu_accept(s->listen_fd, addr, &len);
if (fd < 0 && errno != EINTR) { if (fd < 0 && errno != EINTR) {
s->listen_tag = 0;
return FALSE; return FALSE;
} else if (fd >= 0) { } else if (fd >= 0) {
if (s->do_telnetopt) if (s->do_telnetopt)