[libvirt] [PATCH v5 1/9] libxl: fix libxlDriverConfigDispose for partially constructed object

Marek Marczykowski-Górecki posted 9 patches 7 years, 11 months ago
There is a newer version of this series
[libvirt] [PATCH v5 1/9] libxl: fix libxlDriverConfigDispose for partially constructed object
Posted by Marek Marczykowski-Górecki 7 years, 11 months ago
libxlDriverConfigNew() use libxlDriverConfigDispose() for cleanup in
case of errors. Do not call libxlLoggerFree() on not allocated logger
(NULL).

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
---
Changes since v3:
 - new patch, mostly unrelated, but found while adjusting tests
---
 src/libxl/libxl_conf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 970cff2..2d2a707 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -80,7 +80,8 @@ libxlDriverConfigDispose(void *obj)
 
     virObjectUnref(cfg->caps);
     libxl_ctx_free(cfg->ctx);
-    libxlLoggerFree(cfg->logger);
+    if (cfg->logger)
+        libxlLoggerFree(cfg->logger);
 
     VIR_FREE(cfg->configDir);
     VIR_FREE(cfg->autostartDir);
-- 
git-series 0.9.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v5 1/9] libxl: fix libxlDriverConfigDispose for partially constructed object
Posted by Daniel P. Berrangé 7 years, 11 months ago
On Wed, Mar 14, 2018 at 03:26:08AM +0100, Marek Marczykowski-Górecki wrote:
> libxlDriverConfigNew() use libxlDriverConfigDispose() for cleanup in
> case of errors. Do not call libxlLoggerFree() on not allocated logger
> (NULL).
> 
> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
> Reviewed-by: Jim Fehlig <jfehlig@suse.com>
> ---
> Changes since v3:
>  - new patch, mostly unrelated, but found while adjusting tests
> ---
>  src/libxl/libxl_conf.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


> 
> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
> index 970cff2..2d2a707 100644
> --- a/src/libxl/libxl_conf.c
> +++ b/src/libxl/libxl_conf.c
> @@ -80,7 +80,8 @@ libxlDriverConfigDispose(void *obj)
>  
>      virObjectUnref(cfg->caps);
>      libxl_ctx_free(cfg->ctx);
> -    libxlLoggerFree(cfg->logger);
> +    if (cfg->logger)
> +        libxlLoggerFree(cfg->logger);
>  
>      VIR_FREE(cfg->configDir);
>      VIR_FREE(cfg->autostartDir);
> -- 
> git-series 0.9.1
> 
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list