qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v2 01/15] chardev: fix leak in tcp_chr_telnet_in


From: Paolo Bonzini
Subject: Re: [Qemu-devel] [PATCH v2 01/15] chardev: fix leak in tcp_chr_telnet_init_io()
Date: Thu, 1 Mar 2018 18:39:34 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0

On 01/03/2018 09:44, Peter Xu wrote:
> Need to free TCPChardevTelnetInit when session established.
> 
> Since at it, switch to use G_SOURCE_* macros.
> 
> Reviewed-by: Daniel P. Berrange <address@hidden>
> Signed-off-by: Peter Xu <address@hidden>
> ---
>  chardev/char-socket.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> 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)
> 

Queued, thanks (but it's okay if you post it again in v3, because I'm
not sure I'll be able to send a pull request tomorrow).

Paolo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]