From: Ján Tomko <jtomko@redhat.com>
Date: Sun, 25 Mar 2018 19:14:21 +0000 (+0200)
Subject: virDomainDeviceAliasIsUserAlias: tolerate NULL
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=186412fe76d21f8f54f10d0a4b028dafaaeb0eaa;p=libvirt.git

virDomainDeviceAliasIsUserAlias: tolerate NULL

Do not crash in virDomainDeviceInfoParseXML if someone provides
an 'alias' element without a 'name' attribute.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 43725155c2..ae7c0d9b71 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5573,7 +5573,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
     struct virDomainDefValidateAliasesData *data = opaque;
     const char *alias = info->alias;
 
-    if (!alias || !virDomainDeviceAliasIsUserAlias(alias))
+    if (!virDomainDeviceAliasIsUserAlias(alias))
         return 0;
 
     /* Some crazy backcompat for consoles. */
@@ -6702,7 +6702,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
 bool
 virDomainDeviceAliasIsUserAlias(const char *aliasStr)
 {
-    return STRPREFIX(aliasStr, USER_ALIAS_PREFIX);
+    return aliasStr && STRPREFIX(aliasStr, USER_ALIAS_PREFIX);
 }