Changeset 36411 in vbox for trunk

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.

Location:

trunk/src/VBox/Main

Files:

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

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.

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

@@ -4994 +4994 @@
                                       IN_BSTR aFlags)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
-    if ((aValue != NULL) && !VALID_PTR(aValue))
-        return E_INVALIDARG;
-    if ((aFlags != NULL) && !VALID_PTR(aFlags))
-        return E_INVALIDARG;
-
     HRESULT rc;
 
-    try {
-        ComPtr<IInternalSessionControl> directControl =
-            mData->mSession.mDirectControl;
+    try
+    {
+        ComPtr<IInternalSessionControl> directControl = mData->mSession.mDirectControl;
 
         BSTR dummy = NULL; /* will not be changed (setter) */
@@ -5011 +5005 @@
             rc = E_ACCESSDENIED;
         else
-            rc = directControl->AccessGuestProperty
-                     (aName,
-                      /** @todo Fix when adding DeleteGuestProperty(),
-                                   see defect. */
-                      aValue, aFlags,
-                      true /* isSetter */,
-                      &dummy, &dummy64, &dummy);
+            /** @todo Fix when adding DeleteGuestProperty(),
+                         see defect. */
+            rc = directControl->AccessGuestProperty(aName, aValue, aFlags,
+                                                    true /* isSetter */,
+                                                    &dummy, &dummy64, &dummy);
     }
     catch (std::bad_alloc &)
@@ -5035 +5027 @@
 #else // VBOX_WITH_GUEST_PROPS
     CheckComArgStrNotEmptyOrNull(aName);
-    if ((aFlags != NULL) && !VALID_PTR(aFlags))
-        return E_INVALIDARG;
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+    CheckComArgMaybeNull(aFlags);
+    CheckComArgMaybeNull(aValue);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
 
     HRESULT rc = setGuestPropertyToVM(aName, aValue, aFlags);
@@ -5149 +5143 @@
     ReturnComNotImplemented();
 #else // VBOX_WITH_GUEST_PROPS
-    if (!VALID_PTR(aPatterns) && (aPatterns != NULL))
-        return E_POINTER;
-
+    CheckComArgMaybeNull(aPatterns);
     CheckComArgOutSafeArrayPointerValid(aNames);
     CheckComArgOutSafeArrayPointerValid(aValues);
@@ -11294 +11286 @@
 
     CheckComArgStrNotEmptyOrNull(aName);
-    if (aValue != NULL && (!VALID_PTR(aValue) || !VALID_PTR(aFlags)))
-        return E_POINTER;  /* aValue can be NULL to indicate deletion */
+    CheckComArgMaybeNull(aValue);
+    CheckComArgMaybeNull(aFlags);
 
     try