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

conf: Fix crash in virDomainDefCompatibleDevice

Browse Source 
Commit id 'edae027c' blindly assumed that the passed @oldDev
parameter would not be NULL when calling virDomainDeviceGetInfo;
however, commit id 'b6a264e8' passed NULL for AttachDevice
callers under the premise that there wouldn't be a device
to check/update against.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2018-03-01 07:08:32 -05:00
parent 7a32bedffc
commit 5535856f0e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/domain_conf.c
View File

@ -27417,9 +27417,12 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
{ {
virDomainCompatibleDeviceData data = { virDomainCompatibleDeviceData data = {
.newInfo = virDomainDeviceGetInfo(dev), .newInfo = virDomainDeviceGetInfo(dev),
.oldInfo = virDomainDeviceGetInfo(oldDev), .oldInfo = NULL,
}; };
if (oldDev)
data.oldInfo = virDomainDeviceGetInfo(oldDev);
if (!virDomainDefHasUSB(def) && if (!virDomainDefHasUSB(def) &&
def->os.type != VIR_DOMAIN_OSTYPE_EXE && def->os.type != VIR_DOMAIN_OSTYPE_EXE &&
virDomainDeviceIsUSB(dev)) { virDomainDeviceIsUSB(dev)) {