From 95cd4904e1bfa1d13e95c55a259129b5f349a70e Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 21 Jun 2018 12:11:29 +0200 Subject: [PATCH] virDomainSnapshotDefParse: Prefer VIR_STEAL_PTR Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/snapshot_conf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 787c3d0feb..9c537ac7d1 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -331,8 +331,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, "disk-only snapshot")); goto cleanup; } - def->file = memoryFile; - memoryFile = NULL; + VIR_STEAL_PTR(def->file, memoryFile); /* verify that memory path is absolute */ if (def->file && def->file[0] != '/') { @@ -372,7 +371,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if (!offline && virSaveCookieParse(ctxt, &def->cookie, saveCookie) < 0) goto cleanup; - ret = def; + VIR_STEAL_PTR(ret, def); cleanup: VIR_FREE(creation); @@ -380,8 +379,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, VIR_FREE(nodes); VIR_FREE(memorySnapshot); VIR_FREE(memoryFile); - if (ret == NULL) - virDomainSnapshotDefFree(def); + virDomainSnapshotDefFree(def); return ret; }