External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: fix element size / length in memmove

Browse Source 
The memmove to move elements in the dhcp hosts array when inserting
and deleting items was mistakenly basing the length of the copy on the
size of a virNetworkDHCPHostDefPtr rather than virNetworkDHCPHostDef,
with the expected disastrous results.

The memmove to delete an entry commits two errors - along with the
size of each element being wrong, it also omits some required
parentheses.
This commit is contained in:
Laine Stump 2012-09-19 18:45:58 -04:00
parent 6a1b0e37af
commit db8760ffe6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/network_conf.c
View File

@ -2449,7 +2449,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
} else { /* implied (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) */ } else { /* implied (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) */
memmove(ipdef->hosts + 1, ipdef->hosts, memmove(ipdef->hosts + 1, ipdef->hosts,
sizeof(ipdef->hosts) * ipdef->nhosts); sizeof(*ipdef->hosts) * ipdef->nhosts);
ipdef->hosts[0] = host; ipdef->hosts[0] = host;
ipdef->nhosts++; ipdef->nhosts++;
memset(&host, 0, sizeof(host)); memset(&host, 0, sizeof(host));
@ -2481,7 +2481,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
/* remove it */ /* remove it */
virNetworkDHCPHostDefClear(&ipdef->hosts[ii]); virNetworkDHCPHostDefClear(&ipdef->hosts[ii]);
memmove(ipdef->hosts + ii, ipdef->hosts + ii + 1, memmove(ipdef->hosts + ii, ipdef->hosts + ii + 1,
sizeof(ipdef->hosts) * ipdef->nhosts - ii - 1); sizeof(*ipdef->hosts) * (ipdef->nhosts - ii - 1));
ipdef->nhosts--; ipdef->nhosts--;
ignore_value(VIR_REALLOC_N(ipdef->hosts, ipdef->nhosts)); ignore_value(VIR_REALLOC_N(ipdef->hosts, ipdef->nhosts));
} }