Changeset 50416 in vbox

Timestamp:

Feb 11, 2014 6:00:45 PM (11 years ago)

Author:

vboxsync

Message:

Main: fix the remaining NULL safearray issues, the template had useless assertions and the helper code used by the wrappers also needed to check for it everywhere

Location:

trunk

Files:

• include/VBox/com/array.h (modified) (6 diffs)
• src/VBox/Main/include/Wrapper.h (modified) (2 diffs)

trunk/include/VBox/com/array.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -642 +642 @@
     SafeArray(ComSafeArrayIn(T, aArg))
     {
-#ifdef VBOX_WITH_XPCOM
-
-        AssertReturnVoid(aArg != NULL);
-
-        m.size = aArgSize;
-        m.arr = aArg;
-        m.isWeak = true;
+        if (aArg)
+        {
+#ifdef VBOX_WITH_XPCOM
+
+            m.size = aArgSize;
+            m.arr = aArg;
+            m.isWeak = true;
 
 #else /* !VBOX_WITH_XPCOM */
 
-        AssertReturnVoid(aArg != NULL);
-        SAFEARRAY *arg = aArg;
-
-        if (arg)
-        {
+            SAFEARRAY *arg = aArg;
+
             AssertReturnVoid(arg->cDims == 1);
 
@@ -676 +673 @@
             rc = SafeArrayAccessData(arg, (void HUGEP **)&m.raw);
             AssertComRCReturnVoid(rc);
-        }
-
-        m.arr = arg;
-        m.isWeak = true;
+
+            m.arr = arg;
+            m.isWeak = true;
 
 #endif /* !VBOX_WITH_XPCOM */
+        }
     }
 
@@ -1017 +1014 @@
     virtual SafeArray &detachTo(ComSafeArrayOut(T, aArg))
     {
-        AssertReturn(m.isWeak == false, *this);
+        AssertReturn(!m.isWeak, *this);
 
 #ifdef VBOX_WITH_XPCOM
@@ -1593 +1590 @@
     SafeIfaceArray(ComSafeArrayIn(I *, aArg))
     {
-#ifdef VBOX_WITH_XPCOM
-
-        AssertReturnVoid(aArg != NULL);
-
-        Base::m.size = aArgSize;
-        Base::m.arr = aArg;
-        Base::m.isWeak = true;
+        if (aArg)
+        {
+#ifdef VBOX_WITH_XPCOM
+
+            Base::m.size = aArgSize;
+            Base::m.arr = aArg;
+            Base::m.isWeak = true;
 
 #else /* !VBOX_WITH_XPCOM */
 
-        AssertReturnVoid(aArg != NULL);
-        SAFEARRAY *arg = aArg;
-
-        if (arg)
-        {
+            SAFEARRAY *arg = aArg;
+
             AssertReturnVoid(arg->cDims == 1);
 
@@ -1625 +1619 @@
             rc = SafeArrayAccessData(arg, (void HUGEP **)&m.raw);
             AssertComRCReturnVoid(rc);
-        }
-
-        m.arr = arg;
-        m.isWeak = true;
+
+            m.arr = arg;
+            m.isWeak = true;
 
 #endif /* !VBOX_WITH_XPCOM */
+        }
     }
 

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

@@ -149 +149 @@
     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());
-        for (size_t i = 0; i < inArray.size(); i++)
-            mArray[i] = inArray[i];
+        if (!ComSafeArrayInIsNull(aSrc))
+        {
+            com::SafeArray<IN_BSTR> inArray(ComSafeArrayInArg(aSrc));
+            mArray.resize(inArray.size());
+            for (size_t i = 0; i < inArray.size(); i++)
+                mArray[i] = inArray[i];
+        }
     }
 
@@ -382 +382 @@
     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());
-        for (size_t i = 0; i < inArray.size(); i++)
-            mArray[i] = inArray[i];
+        if (!ComSafeArrayInIsNull(aSrc))
+        {
+            com::SafeIfaceArray<A> inArray(ComSafeArrayInArg(aSrc));
+            mArray.resize(inArray.size());
+            for (size_t i = 0; i < inArray.size(); i++)
+                mArray[i] = inArray[i];
+        }
     }