Re: [Qemu-devel] [PATCH 07/12] readline: add a free function

[Dr. David Alan Gilbert]

* Marc-André Lureau (address@hidden) wrote:
> Fixes leaks such as:
> 
> Direct leak of 2 byte(s) in 1 object(s) allocated from:
>     #0 0x7eff58beb850 in malloc (/lib64/libasan.so.4+0xde850)
>     #1 0x7eff57942f0c in g_malloc ../glib/gmem.c:94
>     #2 0x7eff579431cf in g_malloc_n ../glib/gmem.c:331
>     #3 0x7eff5795f6eb in g_strdup ../glib/gstrfuncs.c:363
>     #4 0x55db720f1d46 in readline_hist_add 
> /home/elmarco/src/qq/util/readline.c:258
>     #5 0x55db720f2d34 in readline_handle_byte 
> /home/elmarco/src/qq/util/readline.c:387
>     #6 0x55db71539d00 in monitor_read /home/elmarco/src/qq/monitor.c:3896
>     #7 0x55db71f9be35 in qemu_chr_be_write_impl 
> /home/elmarco/src/qq/chardev/char.c:167
>     #8 0x55db71f9bed3 in qemu_chr_be_write 
> /home/elmarco/src/qq/chardev/char.c:179
>     #9 0x55db71fa013c in fd_chr_read /home/elmarco/src/qq/chardev/char-fd.c:66
>     #10 0x55db71fe18a8 in qio_channel_fd_source_dispatch 
> /home/elmarco/src/qq/io/channel-watch.c:84
>     #11 0x7eff5793a90b in g_main_dispatch ../glib/gmain.c:3182
>     #12 0x7eff5793b7ac in g_main_context_dispatch ../glib/gmain.c:3847
>     #13 0x55db720af3bd in glib_pollfds_poll 
> /home/elmarco/src/qq/util/main-loop.c:214
>     #14 0x55db720af505 in os_host_main_loop_wait 
> /home/elmarco/src/qq/util/main-loop.c:261
>     #15 0x55db720af6d6 in main_loop_wait 
> /home/elmarco/src/qq/util/main-loop.c:515
>     #16 0x55db7184e0de in main_loop /home/elmarco/src/qq/vl.c:1995
>     #17 0x55db7185e956 in main /home/elmarco/src/qq/vl.c:4914
>     #18 0x7eff4ea17039 in __libc_start_main (/lib64/libc.so.6+0x21039)
> 
> (while at it, use g_new0(ReadLineState), it's a bit easier to read)
> 
> Signed-off-by: Marc-André Lureau <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  include/qemu/readline.h |  1 +
>  monitor.c               |  2 +-
>  util/readline.c         | 18 +++++++++++++++++-
>  3 files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/include/qemu/readline.h b/include/qemu/readline.h
> index c08cf7400e..e81258322b 100644
> --- a/include/qemu/readline.h
> +++ b/include/qemu/readline.h
> @@ -59,5 +59,6 @@ ReadLineState *readline_init(ReadLinePrintfFunc 
> *printf_func,
>                               ReadLineFlushFunc *flush_func,
>                               void *opaque,
>                               ReadLineCompletionFunc *completion_finder);
> +void readline_free(ReadLineState *rs);
>  
>  #endif /* READLINE_H */
> diff --git a/monitor.c b/monitor.c
> index e36fb5308d..024dd3d515 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -584,7 +584,7 @@ static void monitor_data_destroy(Monitor *mon)
>      if (monitor_is_qmp(mon)) {
>          json_message_parser_destroy(&mon->qmp.parser);
>      }
> -    g_free(mon->rs);
> +    readline_free(mon->rs);
>      QDECREF(mon->outbuf);
>      qemu_mutex_destroy(&mon->out_lock);
>  }
> diff --git a/util/readline.c b/util/readline.c
> index bbdee790b0..24ec839854 100644
> --- a/util/readline.c
> +++ b/util/readline.c
> @@ -500,12 +500,28 @@ const char *readline_get_history(ReadLineState *rs, 
> unsigned int index)
>      return rs->history[index];
>  }
>  
> +void readline_free(ReadLineState *rs)
> +{
> +    int i;
> +
> +    if (!rs) {
> +        return;
> +    }
> +    for (i = 0; i < READLINE_MAX_CMDS; i++) {
> +        g_free(rs->history[i]);
> +    }
> +    for (i = 0; i < READLINE_MAX_COMPLETIONS; i++) {
> +        g_free(rs->completions[i]);
> +    }
> +    g_free(rs);
> +}
> +
>  ReadLineState *readline_init(ReadLinePrintfFunc *printf_func,
>                               ReadLineFlushFunc *flush_func,
>                               void *opaque,
>                               ReadLineCompletionFunc *completion_finder)
>  {
> -    ReadLineState *rs = g_malloc0(sizeof(*rs));
> +    ReadLineState *rs = g_new0(ReadLineState, 1);
>  
>      rs->hist_entry = -1;
>      rs->opaque = opaque;
> -- 
> 2.15.1.355.g36791d7216
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK