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

chardev-socket: remove useless if

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2018-03-20 16:18:43 +01:00
parent 87f963be66
commit ff82fab792
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chardev/char-socket.c
View File

@ -550,12 +550,10 @@ static void tcp_chr_connect(void *opaque)
s->is_listen, s->is_telnet); s->is_listen, s->is_telnet);
s->connected = 1; s->connected = 1;
if (s->ioc) { chr->gsource = io_add_watch_poll(chr, s->ioc,
chr->gsource = io_add_watch_poll(chr, s->ioc, tcp_chr_read_poll,
tcp_chr_read_poll, tcp_chr_read,
tcp_chr_read, chr, chr->gcontext);
chr, chr->gcontext);
}
s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP); s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP);
g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup, g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup,