Changeset 36411 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 24, 2011 4:59:10 PM (14 years ago)

Author:

vboxsync

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

70766

Message:

MachineImpl.cpp,VirtualBoxBase.h: Re r70709 - caller validated the setGuestPropertyToVM arguments already. Checking the caller I found a few VALID_PTR checks which didn't set error, added CheckComArgMaybeNull to hide deal with it.

File:

• trunk/src/VBox/Main/include/VirtualBoxBase.h (modified) (1 diff)

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

@@ -324 +324 @@
 
 /**
+ * Checks that the pointer argument is a valid pointer or NULL and returns
+ * E_INVALIDARG + extended error info on failure.
+ * @param arg   Input pointer-type argument (strings, interface pointers...)
+ */
+#define CheckComArgMaybeNull(arg) \
+    do { \
+        if (RT_UNLIKELY(!RT_VALID_PTR(arg) && (arg) != NULL)) \
+            return setError(E_INVALIDARG, tr("Argument %s is an invalid pointer"), #arg); \
+    } while (0)
+
+/**
  * Checks that safe array argument is not NULL and returns E_INVALIDARG +
  * extended error info on failure.