NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virDomainDeviceAliasIsUserAlias: tolerate NULL

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

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-25 21:14:21 +02:00
parent 5123e6ed1f
commit 186412fe76
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -5573,7 +5573,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
struct virDomainDefValidateAliasesData *data = opaque; struct virDomainDefValidateAliasesData *data = opaque;
const char *alias = info->alias; const char *alias = info->alias;
if (!alias || !virDomainDeviceAliasIsUserAlias(alias)) if (!virDomainDeviceAliasIsUserAlias(alias))
return 0; return 0;
/* Some crazy backcompat for consoles. */ /* Some crazy backcompat for consoles. */
@ -6702,7 +6702,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
bool bool
virDomainDeviceAliasIsUserAlias(const char *aliasStr) virDomainDeviceAliasIsUserAlias(const char *aliasStr)
{ {
return STRPREFIX(aliasStr, USER_ALIAS_PREFIX); return aliasStr && STRPREFIX(aliasStr, USER_ALIAS_PREFIX);
} }