]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Check for errors when converting PCI address to string
authorJiri Denemark <jdenemar@redhat.com>
Fri, 20 Aug 2010 11:53:54 +0000 (13:53 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 20 Aug 2010 14:26:28 +0000 (16:26 +0200)
src/qemu/qemu_conf.c

index fb852208608aae18f8806904385432e24b9e889f..c7ed0a336b73313d0e006da7d79ebbd057e92a3f 100644 (file)
@@ -2096,6 +2096,8 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
 
     if (dev->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
         char *addr = qemuPCIAddressAsString(dev);
+        if (!addr)
+            return -1;
 
         VIR_DEBUG("Remembering PCI addr %s", addr);
 
@@ -2239,7 +2241,8 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs,
         maybe.addr.pci.bus = 0;
         maybe.addr.pci.slot = i;
 
-        addr = qemuPCIAddressAsString(&maybe);
+        if (!(addr = qemuPCIAddressAsString(&maybe)))
+            return -1;
 
         if (virHashLookup(addrs->used, addr)) {
             VIR_DEBUG("PCI addr %s already in use", addr);