Message ID | 20180228050633.7410-2-peterx@redhat.com |
---|---|
State | New |
Headers | show |
Series | [01/14] chardev: fix leak in tcp_chr_telnet_init_io() | expand |
On Wed, Feb 28, 2018 at 01:06:20PM +0800, Peter Xu wrote: > Need to free TCPChardevTelnetInit when session established. > > Since at it, switch to use G_SOURCE_* macros. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > chardev/char-socket.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index bdd6cff5f6..43a2cc2c1c 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -591,19 +591,23 @@ static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc, ret = 0; } else { tcp_chr_disconnect(init->chr); - return FALSE; + goto end; } } init->buflen -= ret; if (init->buflen == 0) { tcp_chr_connect(init->chr); - return FALSE; + goto end; } memmove(init->buf, init->buf + ret, init->buflen); - return TRUE; + return G_SOURCE_CONTINUE; + +end: + g_free(init); + return G_SOURCE_REMOVE; } static void tcp_chr_telnet_init(Chardev *chr)
Need to free TCPChardevTelnetInit when session established. Since at it, switch to use G_SOURCE_* macros. Signed-off-by: Peter Xu <peterx@redhat.com> --- chardev/char-socket.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)