Re: [Qemu-devel] [PATCH 2/9] chardev: fix leak in tcp_chr_telnet_init_io()

[Marc-André Lureau]

On Mon, Mar 5, 2018 at 7:50 AM, Peter Xu <address@hidden> wrote:
> Need to free TCPChardevTelnetInit when session established.
>
> Since at it, switch to use G_SOURCE_* macros.
>
> Reviewed-by: Daniel P. Berrange <address@hidden>
> Reviewed-by: Paolo Bonzini <address@hidden>
> Signed-off-by: Peter Xu <address@hidden>

Reviewed-by: Marc-André Lureau <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 113feaf948..205ee377a4 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)
> --
> 2.14.3
>