Changeset 45706 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 24, 2013 2:42:02 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85252

Message:

more temporary debugging

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxBase.h (modified) (2 diffs)
• src-client/SessionImpl.cpp (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -339 +339 @@
     } while (0)
 
+#define CheckComArgMaybeNull1(arg, err) \
+    do { \
+        if (RT_UNLIKELY(!RT_VALID_PTR(arg) && (arg) != NULL)) \
+            return setError(err, tr("Argument %s is an invalid pointer"), #arg); \
+    } while (0)
+
 /**
  * Checks that safe array argument is not NULL and returns E_INVALIDARG +
@@ -371 +377 @@
         if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck) || *(bstrInCheck) == '\0')) \
             return setError(E_INVALIDARG, tr("Argument %s is empty or an invalid pointer"), #a_bstrIn); \
+    } while (0)
+#define CheckComArgStrNotEmptyOrNull1(a_bstrIn, err) \
+    do { \
+        IN_BSTR const bstrInCheck = (a_bstrIn); /* type check */ \
+        if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck) || *(bstrInCheck) == '\0')) \
+            return setError(err, tr("Argument %s is empty or an invalid pointer"), #a_bstrIn); \
     } while (0)
 

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -802 +802 @@
                         Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgStrNotEmptyOrNull1(aName, 0x80face05);
     if (!aIsSetter && !VALID_PTR(aRetValue))
         return E_POINTER;
@@ -811 +811 @@
     /* aValue can be NULL for a setter call if the property is to be deleted. */
     if (aIsSetter && (aValue != NULL) && !VALID_PTR(aValue))
-        return setError(E_INVALIDARG, tr("Invalid value pointer"));
+        return setError(0x80face06, tr("Invalid value pointer"));
     /* aFlags can be null if it is to be left as is */
     if (aIsSetter && (aFlags != NULL) && !VALID_PTR(aFlags))
-        return setError(E_INVALIDARG, tr("Invalid flags pointer"));
+        return setError(0x80face07, tr("Invalid flags pointer"));
 
     /* If this session is not in a VM process fend off the call. The caller

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5863 +5863 @@
 #else // VBOX_WITH_GUEST_PROPS
     CheckComArgStrNotEmptyOrNull(aName);
-    CheckComArgMaybeNull(aFlags);
-    CheckComArgMaybeNull(aValue);
+    CheckComArgMaybeNull1(aFlags, 0x80face03);
+    CheckComArgMaybeNull1(aValue, 0x80face04);
 
     AutoCaller autoCaller(this);