The Monday 26 May 2014 à 19:37:09 (+0200), Markus Armbruster wrote :
> blockdev_init() leaks bs_opts when qemu_opts_create() fails, i.e. when
> the ID is bad. Missed in commit ec9c10d.
>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> ---
> blockdev.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index 1cbcc1c..6460c70 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -352,7 +352,7 @@ static DriveInfo *blockdev_init(const char *file, QDict
> *bs_opts,
> opts = qemu_opts_create(&qemu_common_drive_opts, id, 1, &error);
> if (error) {
> error_propagate(errp, error);
> - return NULL;
> + goto err_no_opts;
> }
>
> qemu_opts_absorb_qdict(opts, bs_opts, &error);
> @@ -565,8 +565,9 @@ bdrv_new_err:
> g_free(dinfo->id);
> g_free(dinfo);
> early_err:
> - QDECREF(bs_opts);
> qemu_opts_del(opts);
> +err_no_opts:
> + QDECREF(bs_opts);
> return NULL;
> }
>
> --
> 1.9.3
>
>
Reviewed-by: Benoit Canet <ben...@irqsave.net>
