[PATCH v2] qemuDomainSaveInternal: fix memoryleak of virDomainDef

[zhengchuan]

Thanks for your review.
I'll remind myself and follow the libvirt coding style in future work:)

-----Original Message-----
From: Laine Stump [mailto:laine at redhat.com] 
Sent: 2020年7月30日 3:52
To: libvir-list at redhat.com
Cc: zhengchuan <zhengchuan at huawei.com>; fangying <fangying1 at huawei.com>; Chenzhendong (alex) <alex.chen at huawei.com>; wanghao (O) <wanghao232 at huawei.com>; Zhanghailiang <zhang.zhanghailiang at huawei.com>; yubihong <yubihong at huawei.com>
Subject: Re: [PATCH v2] qemuDomainSaveInternal: fix memoryleak of virDomainDef

On 7/28/20 11:42 PM, Chuan Zheng wrote:
> From: Zheng Chuan <zhengchuan at huawei.com>
>
> virDomainDefPtr 'def' is forgot to free after qemuDomainDefFormatLive(), fix it.
>
> Signed-off-by: Zheng Chuan <zhengchuan at huawei.com>
> ---
>   src/qemu/qemu_driver.c | 9 +++------
>   1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 
> 53980d4..2dafe7c 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -3356,18 +3356,15 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver,
>        * is NULL or whether it was the live xml of the domain moments
>        * before.  */
>       if (xmlin) {
> -        virDomainDefPtr def = NULL;
> +        g_autoptr(virDomainDef) def = NULL;
>   
>           if (!(def = virDomainDefParseString(xmlin, driver->xmlopt,
>                                               priv->qemuCaps,
>                                               VIR_DOMAIN_DEF_PARSE_INACTIVE |
> -                                            VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) {
> +                                            
> + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
>               goto endjob;
> -        }


I had actually meant the {} below this comment, not the ones above ^^. 
Braces are required by the libvirt coding style guide
(https://libvirt.org/coding-style.html#curly-braces) if either the condition or the body is multi-lined.

> -        if (!qemuDomainCheckABIStability(driver, vm, def)) {
> -            virDomainDefFree(def);
> +        if (!qemuDomainCheckABIStability(driver, vm, def))
>               goto endjob;
> -        }
>           xml = qemuDomainDefFormatLive(driver, priv->qemuCaps, def, NULL, true, true);
>       } else {
>           xml = qemuDomainDefFormatLive(driver, priv->qemuCaps, 
> vm->def,


This looks good now.


Reviewed-by: Laine Stump <laine at redhat.com>


(and pushed)


Before pushing, I added back the extra braces you removed, and reworded the commit log message to be more in line with our standard template (and also noted the commit when the leak was added - 0ea479f8f6 all the way back in July 2011!)


I thought about not pushing this until after the freeze is over and
6.7.0 is released (since it is a bug, but a bug that's been in the code for 9 years), but in the end decided to push it, because 1) it's a bonafide leak in the  *non*-error path of a libvirt public API, it's very simple, and 3) I would probably forget to push it if I waited until after the freeze is over.


Thanks!