[libvirt] [PATCH] qemu: Check for errors when converting PCI address to string
--- src/qemu/qemu_conf.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb85220..c7ed0a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -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); -- 1.7.2
On 08/20/2010 06:02 AM, Jiri Denemark wrote:
--- src/qemu/qemu_conf.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb85220..c7ed0a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -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;
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
src/qemu/qemu_conf.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb85220..c7ed0a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -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;
ACK.
Thanks, pushed. Jirka
participants (2)
-
Eric Blake -
Jiri Denemark