From: Laine Stump <laine@laine.org>
Date: Wed, 19 Sep 2012 22:45:58 +0000 (-0400)
Subject: network: fix element size / length in memmove
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=db8760ffe67cc2a4af62cf29af3985e4d20ec66e;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

network: fix element size / length in memmove

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.
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index db398ae89..591eb0311 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2449,7 +2449,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
         } else { /* implied (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) */
 
             memmove(ipdef->hosts + 1, ipdef->hosts,
-                    sizeof(ipdef->hosts) * ipdef->nhosts);
+                    sizeof(*ipdef->hosts) * ipdef->nhosts);
             ipdef->hosts[0] = host;
             ipdef->nhosts++;
             memset(&host, 0, sizeof(host));
@@ -2481,7 +2481,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
         /* remove it */
         virNetworkDHCPHostDefClear(&ipdef->hosts[ii]);
         memmove(ipdef->hosts + ii, ipdef->hosts + ii + 1,
-                sizeof(ipdef->hosts) * ipdef->nhosts - ii - 1);
+                sizeof(*ipdef->hosts) * (ipdef->nhosts - ii - 1));
         ipdef->nhosts--;
         ignore_value(VIR_REALLOC_N(ipdef->hosts, ipdef->nhosts));
     }