Changeset 29814 in vbox for trunk/src/VBox

Timestamp:

May 26, 2010 12:08:52 PM (15 years ago)

Author:

vboxsync

Message:

Webservice: fix more potential races in ManagedObjectRef::InterfaceName() and IManagedObjectRef_release()

File:

• trunk/src/VBox/Main/webservice/vboxweb.cpp (modified) (6 diffs)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1472 +1472 @@
 
     do {
+        util::AutoReadLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
+
         ManagedObjectRef *pRef;
         if (!ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false))
@@ -1503 +1505 @@
 
     do {
+        util::AutoReadLock lock(g_pSessionsLockHandle COMMA_LOCKVAL_SRC_POS);
+
         ManagedObjectRef *pRef;
         if ((rc = ManagedObjectRef::findRefFromId(req->_USCOREthis, &pRef, false)))
@@ -1556 +1560 @@
  * client to clean up itself.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
- * Since this gets called from main() like other SOAP method
- * implementations, this is ensured.
- *
  * @param
  * @param vbox__IWebsessionManager_USCORElogon
@@ -1585 +1585 @@
                                      req->password.c_str())))
         {
-            // in the new session, create a managed object reference (moref) for the
-            // global VirtualBox object; this encodes the session ID in the moref so
+            // in the new session, create a managed object reference (MOR) for the
+            // global VirtualBox object; this encodes the session ID in the MOR so
             // that it will be implicitly be included in all future requests of this
             // webservice client
@@ -1604 +1604 @@
  * Returns the ISession object that was created for the webservice client
  * on logon.
- *
- * Preconditions: Caller must have locked g_mutexSessions.
- * Since this gets called from main() like other SOAP method
- * implementations, this is ensured.
  */
 int __vbox__IWebsessionManager_USCOREgetSessionObject(
@@ -1637 +1633 @@
  * hard-coded implementation for IWebsessionManager::logoff.
  *
- * Preconditions: Caller must have locked g_mutexSessions.
- * Since this gets called from main() like other SOAP method
- * implementations, this is ensured.
- *
  * @param
  * @param vbox__IWebsessionManager_USCORElogon