Re: [Qemu-devel] [PATCH v2 1/3] nfs: Fix leak of opts in nfs_file_open

[Benoît Canet]

The Thursday 28 Aug 2014 à 12:12:36 (+0800), Fam Zheng wrote :
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  block/nfs.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/block/nfs.c b/block/nfs.c
> index 93d87f3..8740c1a 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -393,15 +393,19 @@ static int nfs_file_open(BlockDriverState *bs, QDict 
> *options, int flags,
>      qemu_opts_absorb_qdict(opts, options, &local_err);
>      if (local_err) {
>          error_propagate(errp, local_err);
> -        return -EINVAL;
> +        ret = -EINVAL;
> +        goto out;
>      }
>      ret = nfs_client_open(client, qemu_opt_get(opts, "filename"),
>                            (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY,
>                            errp);
>      if (ret < 0) {
> -        return ret;
> +        goto out;
>      }
>      bs->total_sectors = ret;
> +    ret = 0;
> +out:
> +    qemu_opts_del(opts);

>      return 0;

Hmm ... "return ret;" ? ;)

>  }
>  
> -- 
> 2.1.0
>