External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: don't leak in qemuGetDHCPInterfaces when failing to alloc

Browse Source 
We forgot to free alloced mem when failed to
dup ifname or macaddr.

Also use VIR_STEAL_PTR to simplify codes.

Signed-off-by: Chen Hanxiao <chenhanxiao@gmail.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Chen Hanxiao 2018-02-11 11:07:10 +08:00 committed by Michal Privoznik
parent a90a1bf9e1
commit 60a95e5242
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_agent.c
View File

@ -2190,8 +2190,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon,
iface->naddrs = addrs_count;
}
*ifaces = ifaces_ret;
ifaces_ret = NULL;
VIR_STEAL_PTR(*ifaces, ifaces_ret);
ret = ifaces_count;
cleanup:

9
src/qemu/qemu_driver.c
View File

@ -20569,10 +20569,10 @@ qemuGetDHCPInterfaces(virDomainPtr dom,
goto error;
if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0)
goto cleanup;
goto error;
if (VIR_STRDUP(iface->hwaddr, macaddr) < 0)
goto cleanup;
goto error;
}
for (j = 0; j < n_leases; j++) {
@ -20580,7 +20580,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom,
virDomainIPAddressPtr ip_addr = &iface->addrs[j];
if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0)
goto cleanup;
goto error;
ip_addr->type = lease->type;
ip_addr->prefix = lease->prefix;
@ -20592,8 +20592,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom,
VIR_FREE(leases);
}
*ifaces = ifaces_ret;
ifaces_ret = NULL;
VIR_STEAL_PTR(*ifaces, ifaces_ret);
rv = ifaces_count;
cleanup: