Fix a memory error on Xen device removal

* src/xm_internals.c: the memory shrinking on device removal
  didn't copy the right amount of memory, patch by Daniel Berrange
  fixes #497051
daniel

diff --git a/ChangeLog b/ChangeLog
index e7f87d26d1e32619c2024777063f67a58216e4cc..f50523f89f92138269edb9021a45ee04b94245fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun  4 15:54:24 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/xm_internals.c: the memory shrinking on device removal
+         didn't copy the right amount of memory, patch by Daniel Berrange
+         fixes #497051
+
 Wed Jun  3 15:32:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        * src/vbox/vbox_tmpl.c: Add NUMA memory APIs

diff --git a/src/xm_internal.c b/src/xm_internal.c
index 95f70b0ccb124830b91f030488cf2daafa49ded2..f4b3a6ca2e4fe2d9092a3cc8da9d7f168b2b4d1d 100644 (file)
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2943,7 +2943,8 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) {
                 if (i < (def->ndisks - 1))
                     memmove(def->disks + i,
                             def->disks + i + 1,
-                            def->ndisks - (i + 1));
+                            sizeof(*def->disks) *
+                            (def->ndisks - (i + 1)));
                 break;
             }
         }
@@ -2960,7 +2961,8 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) {
                 if (i < (def->nnets - 1))
                     memmove(def->nets + i,
                             def->nets + i + 1,
-                            def->nnets - (i + 1));
+                            sizeof(*def->nets) *
+                            (def->nnets - (i + 1)));
                 break;
             }
         }