External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenapi: Resolve Coverity REVERSE_INULL

Browse Source 
Coverity complains that "net_set" is compared to NULL before calling
xen_network_set_free, but used rather liberally before that.  While
I was looking at the code I also noted that if the virAsprintfQuiet
fails, then we leak our structures - so I added those too.

(cherry picked from commit 6da29e0faa)
This commit is contained in:
John Ferlan 2015-03-10 19:10:34 -04:00 committed by Cole Robinson
parent e4afc2a29d
commit 2cb4b820fd
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/xenapi/xenapi_utils.c
View File

@ -399,14 +399,16 @@ createVifNetwork(virConnectPtr conn, xen_vm vm, int device,
xen_network_set *net_set = NULL; xen_network_set *net_set = NULL;
xen_network_record *net_rec = NULL; xen_network_record *net_rec = NULL;
int cnt = 0; int cnt = 0;
if (xen_network_get_all(session, &net_set)) { if (!xen_network_get_all(session, &net_set)) {
for (cnt = 0; cnt < net_set->size; cnt++) { xen_vm_record_opt_free(vm_opt);
if (xen_network_get_record(session, &net_rec, net_set->contents[cnt])) { return -1;
if (STREQ(net_rec->bridge, bridge)) { }
break; for (cnt = 0; cnt < net_set->size; cnt++) {
} else { if (xen_network_get_record(session, &net_rec, net_set->contents[cnt])) {
xen_network_record_free(net_rec); if (STREQ(net_rec->bridge, bridge)) {
} break;
} else {
xen_network_record_free(net_rec);
} }
} }
} }
@ -425,8 +427,12 @@ createVifNetwork(virConnectPtr conn, xen_vm vm, int device,
vif_record->other_config = xen_string_string_map_alloc(0); vif_record->other_config = xen_string_string_map_alloc(0);
vif_record->runtime_properties = xen_string_string_map_alloc(0); vif_record->runtime_properties = xen_string_string_map_alloc(0);
vif_record->qos_algorithm_params = xen_string_string_map_alloc(0); vif_record->qos_algorithm_params = xen_string_string_map_alloc(0);
if (virAsprintfQuiet(&vif_record->device, "%d", device) < 0) if (virAsprintfQuiet(&vif_record->device, "%d", device) < 0) {
xen_vif_record_free(vif_record);
xen_network_record_free(net_rec);
xen_network_set_free(net_set);
return -1; return -1;
}
xen_vif_create(session, &vif, vif_record); xen_vif_create(session, &vif, vif_record);
if (!vif) { if (!vif) {
xen_vif_free(vif); xen_vif_free(vif);
@ -438,7 +444,7 @@ createVifNetwork(virConnectPtr conn, xen_vm vm, int device,
xen_vif_record_free(vif_record); xen_vif_record_free(vif_record);
xen_network_record_free(net_rec); xen_network_record_free(net_rec);
} }
if (net_set != NULL) xen_network_set_free(net_set); xen_network_set_free(net_set);
return -1; return -1;
} }