diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-20 16:18:43 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-03-26 14:37:14 +0200 |
| commit | ff82fab792cba01f29a700e4c4ac660753961fbb (patch) | |
| tree | 3c6042c8ec7d95498ef66e0cd86926a30a9d2eda | |
| parent | 87f963be66a32453e001d1052b000f1653605caa (diff) | |
| download | focaccia-qemu-ff82fab792cba01f29a700e4c4ac660753961fbb.tar.gz focaccia-qemu-ff82fab792cba01f29a700e4c4ac660753961fbb.zip | |
chardev-socket: remove useless if
This trips Coverity, which believes the subsequent qio_channel_create_watch can dereference a NULL pointer. In reality, tcp_chr_connect's callers all have s->ioc properly initialized, since they are all rooted at tcp_chr_new_client. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | chardev/char-socket.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index d057192ced..159e69c3b1 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -550,12 +550,10 @@ static void tcp_chr_connect(void *opaque) s->is_listen, s->is_telnet); s->connected = 1; - if (s->ioc) { - chr->gsource = io_add_watch_poll(chr, s->ioc, - tcp_chr_read_poll, - tcp_chr_read, - chr, chr->gcontext); - } + chr->gsource = io_add_watch_poll(chr, s->ioc, + tcp_chr_read_poll, + tcp_chr_read, + chr, chr->gcontext); s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP); g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup, |