Changeset 50151 in vbox

Timestamp:

Jan 21, 2014 7:16:49 PM (11 years ago)

Author:

vboxsync

Message:

Wrapper.h: Fixed regression in IAppliance::importMachines where a NULL options array was causing assertions in debug builds despite working fine before conversion to wrappers. (tstOVF triggered it)

File:

• trunk/src/VBox/Main/include/Wrapper.h (modified) (3 diffs)

trunk/src/VBox/Main/include/Wrapper.h

@@ -151 +151 @@
     ArrayBSTRInConverter(ComSafeArrayIn(IN_BSTR, aSrc))
     {
+        /** @todo How to handle ComSafeArrayInIsNull(aSrc)?  Is it appropriate to
+         *        assert everywhere like we currently do?  It wasn't for the
+         *        ArrayInConverter class (IAppliance::importMachines)... */
         com::SafeArray<IN_BSTR> inArray(ComSafeArrayInArg(aSrc));
         mArray.resize(inArray.size());
@@ -381 +384 @@
     ArrayComTypeInConverter(ComSafeArrayIn(A *, aSrc))
     {
+        /** @todo How to handle ComSafeArrayInIsNull(aSrc)?  Is it appropriate to
+         *        assert everywhere like we currently do?  It wasn't for the
+         *        ArrayInConverter class (IAppliance::importMachines)... */
         com::SafeIfaceArray<A> inArray(ComSafeArrayInArg(aSrc));
         mArray.resize(inArray.size());
@@ -460 +466 @@
     ArrayInConverter(ComSafeArrayIn(A, aSrc))
     {
-        com::SafeArray<A> inArray(ComSafeArrayInArg(aSrc));
-        mArray.resize(inArray.size());
-        for (size_t i = 0; i < inArray.size(); i++)
-            mArray[i] = inArray[i];
+        if (!ComSafeArrayInIsNull(aSrc))
+        {
+            com::SafeArray<A> inArray(ComSafeArrayInArg(aSrc));
+            mArray.resize(inArray.size());
+            for (size_t i = 0; i < inArray.size(); i++)
+                mArray[i] = inArray[i];
+        }
     }