Changeset 10305 in vbox for trunk/src/VBox/Main/SessionImpl.cpp

Timestamp:

Jul 7, 2008 10:33:33 AM (16 years ago)

Author:

vboxsync

Message:

Main: Lock the object before switching on non-const data members.

File:

• trunk/src/VBox/Main/SessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/SessionImpl.cpp

@@ -655 +655 @@
 
 STDMETHODIMP Session::AccessGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue,
-                                           BOOL isSetter, BSTR *retValue)
+                                           BOOL aIsSetter, BSTR *aRetValue)
 {
 #ifdef VBOX_WITH_INFO_SVC
@@ -663 +663 @@
     if (mState != SessionState_Open)
         return setError (E_FAIL,
-                         tr ("Machine session is not open (session state: %d) - please retry."),
-                         mState);
+            tr ("Machine session is not open (session state: %d)."),
+            mState);
     AssertReturn (mType == SessionType_Direct, E_UNEXPECTED);
-    if (!VALID_PTR(aKey))
+    if (!VALID_PTR (aKey))
         return E_POINTER;
-    if (!isSetter && !VALID_PTR(retValue))
+    if (!aIsSetter && !VALID_PTR (aRetValue))
         return E_POINTER;
     /* aValue can be NULL for a setter call if the property is to be deleted. */
-    if (isSetter && (aValue != NULL) && !VALID_PTR(aValue))
-        return E_POINTER;
-    if (!isSetter)
-        return mConsole->getGuestProperty(aKey, retValue);
+    if (aIsSetter && (aValue != NULL) && !VALID_PTR (aValue))
+        return E_INVALIDARG;
+    if (!aIsSetter)
+        return mConsole->getGuestProperty (aKey, aRetValue);
     else
-        return mConsole->setGuestProperty(aKey, aValue);
+        return mConsole->setGuestProperty (aKey, aValue);
 #else
     return E_NOTIMPL;