]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
vbox: avoid provoking assertions in VBoxSVC
authorJean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>
Fri, 13 Apr 2012 13:04:14 +0000 (15:04 +0200)
committerEric Blake <eblake@redhat.com>
Tue, 17 Apr 2012 16:49:26 +0000 (10:49 -0600)
Passing a NULL pointer to IMachine::delete virtualbox API
causes VBoxSVC to raise an assertion. This patch passes
an empty array instead.

src/vbox/vbox_tmpl.c

index 68e3b053a0d041d5ed489cf1f36071bcde22dcbc..be25828f7bddd017341fa43c7ec8ad47792af54c 100644 (file)
@@ -5294,7 +5294,8 @@ vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags)
 
         ((IMachine_Delete)machine->vtbl->Delete)(machine, &safeArray, &progress);
 # else
-        machine->vtbl->Delete(machine, 0, NULL, &progress);
+        vboxArray array = VBOX_ARRAY_INITIALIZER;
+        machine->vtbl->Delete(machine, 0, (IMedium**)&array, &progress);
 # endif
         if (progress != NULL) {
             progress->vtbl->WaitForCompletion(progress, -1);