Changeset 18583 in vbox for trunk

Timestamp:

Mar 31, 2009 4:50:55 PM (16 years ago)

Author:

vboxsync

Message:

OVF: fix wrong use of input array

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -3689 +3689 @@
     AutoWriteLock alock(this);
 
-    com::SafeArray<IN_BSTR> aVboxValues(ComSafeArrayInArg(argVboxValues));
-    com::SafeArray<IN_BSTR> aExtraConfigValues(ComSafeArrayInArg(argExtraConfigValues));
-
-    if (    (aVboxValues.size() != m->llDescriptions.size())
-         || (aExtraConfigValues.size() != m->llDescriptions.size())
+    com::SafeArray<BOOL> sfaEnabled(ComSafeArrayInArg(aEnabled));
+    com::SafeArray<IN_BSTR> sfaVboxValues(ComSafeArrayInArg(argVboxValues));
+    com::SafeArray<IN_BSTR> sfaExtraConfigValues(ComSafeArrayInArg(argExtraConfigValues));
+
+    if (    (sfaEnabled.size() != m->llDescriptions.size())
+         || (sfaVboxValues.size() != m->llDescriptions.size())
+         || (sfaExtraConfigValues.size() != m->llDescriptions.size())
        )
         return E_INVALIDARG;
@@ -3705 +3707 @@
         VirtualSystemDescriptionEntry& vsde = *it;
 
-        if (aEnabled[i])
+        if (sfaEnabled[i])
         {
-            vsde.strVbox = aVboxValues[i];
-            vsde.strExtraConfig = aExtraConfigValues[i];
+            vsde.strVbox = sfaVboxValues[i];
+            vsde.strExtraConfig = sfaExtraConfigValues[i];
         }
         else
@@ -4193 +4195 @@
         // finally, add the virtual system to the appliance
         Appliance *pAppliance = static_cast<Appliance*>(aAppliance);
-        AutoCaller autoCaller(pAppliance);
-        if (FAILED(rc)) throw rc;
+        AutoCaller autoCaller1(pAppliance);
+        CheckComRCReturnRC(autoCaller1.rc());
 
         /* We return the new description to the caller */