On Fri, Feb 08, 2019 at 01:36:55PM -0500, John Ferlan wrote:
Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx> --- src/conf/domain_conf.c | 3 +-- src/conf/storage_conf.c | 3 +-- src/qemu/qemu_parse_command.c | 3 +-- src/util/virstoragefile.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
NB: in the two cases below, the assignment can be performed multiple times (e.g. by supplying <auth> multiple times to an iscsi hostdev) and leak the memory, but that's out of scope of this patch. Jano
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6772c327ed..a33f18c957 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7632,8 +7632,7 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode,
authdef->secrettype);
goto cleanup;
}
- iscsisrc->src->auth = authdef;
- authdef = NULL;
+ VIR_STEAL_PTR(iscsisrc->src->auth, authdef);
}
cur = cur->next;
}
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 8319ba9c8c..98f9bc803f 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2895,9 +2895,8 @@ virStorageSourceParseRBDColonString(const char *rbdstr,
if (VIR_STRDUP(authdef->secrettype,
virSecretUsageTypeToString(VIR_SECRET_USAGE_TYPE_CEPH)) < 0)
goto error;
- src->auth = authdef;
+ VIR_STEAL_PTR(src->auth, authdef);
src->authInherited = true;
- authdef = NULL;
/* Cannot formulate a secretType (eg, usage or uuid) given
* what is provided.
--
2.20.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: PGP signature
