From 3cf61dd5f02899874c4d65218cabe28ab828d837 Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Sun, 22 Apr 2012 10:31:33 +0200 Subject: [PATCH] vbox: Fix passing an empty IMedium* array to IMachine::Delete vboxArray is not castable to a COM item type. vboxArray is a wrapper around the XPCOM and MSCOM specific array handling. In this case we can avoid passing NULL as an empty array to IMachine::Delete by passing a dummy IMedium* array with a single NULL item. --- src/vbox/vbox_tmpl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 57c18a432e..4b0ee2efce 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -5294,11 +5294,10 @@ vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) ((IMachine_Delete)machine->vtbl->Delete)(machine, &safeArray, &progress); # else - union { - vboxArray array; - IMedium *medium; - } u = { .array = VBOX_ARRAY_INITIALIZER }; - machine->vtbl->Delete(machine, 0, &u.medium, &progress); + /* XPCOM doesn't like NULL as an array, even when the array size is 0. + * Instead pass it a dummy array to avoid passing NULL. */ + IMedium *array[] = { NULL }; + machine->vtbl->Delete(machine, 0, array, &progress); # endif if (progress != NULL) { progress->vtbl->WaitForCompletion(progress, -1);