External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuAgentGetInterfaceOneAddress: check for errors early

Browse Source 
For readability, and to ensure we do allocation when
returning 0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Ján Tomko 2020-10-07 14:04:04 +02:00
parent cac5cf33b2
commit 031514e022
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_agent.c
View File

@ -2073,11 +2073,9 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr ip_addr,
_("qemu agent didn't provide 'ip-address-type'" _("qemu agent didn't provide 'ip-address-type'"
" field for interface '%s'"), name); " field for interface '%s'"), name);
return -1; return -1;
} else if (STREQ(type, "ipv4")) { }
ip_addr->type = VIR_IP_ADDR_TYPE_IPV4;
} else if (STREQ(type, "ipv6")) { if (STRNEQ(type, "ipv4") && STRNEQ(type, "ipv6")) {
ip_addr->type = VIR_IP_ADDR_TYPE_IPV6;
} else {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown ip address type '%s'"), _("unknown ip address type '%s'"),
type); type);
@ -2091,7 +2089,6 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr ip_addr,
" field for interface '%s'"), name); " field for interface '%s'"), name);
return -1; return -1;
} }
ip_addr->addr = g_strdup(addr);
if (virJSONValueObjectGetNumberUint(ip_addr_obj, "prefix", if (virJSONValueObjectGetNumberUint(ip_addr_obj, "prefix",
&ip_addr->prefix) < 0) { &ip_addr->prefix) < 0) {
@ -2100,6 +2097,12 @@ qemuAgentGetInterfaceOneAddress(virDomainIPAddressPtr ip_addr,
return -1; return -1;
} }
if (STREQ(type, "ipv4"))
ip_addr->type = VIR_IP_ADDR_TYPE_IPV4;
else
ip_addr->type = VIR_IP_ADDR_TYPE_IPV6;
ip_addr->addr = g_strdup(addr);
return 0; return 0;
} }