Changeset 17350 in vbox

Timestamp:

Mar 4, 2009 3:54:40 PM (16 years ago)

Author:

vboxsync

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

43739

Message:

Main/GuestProperties: the session machine directControl pointer can be NULL, check this

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp ¶

@@ -3010 +3010 @@
         alock.unlock();
 
-        rc = directControl->AccessGuestProperty (aName, NULL, NULL,
-                                                 false /* isSetter */,
-                                                 aValue, aTimestamp, aFlags);
+        /* fail if we were called after #OnSessionEnd() is called.  This is a
+         * silly race condition. */
+
+        if (!directControl)
+            rc = E_FAIL;
+        else
+            rc = directControl->AccessGuestProperty (aName, NULL, NULL,
+                                                     false /* isSetter */,
+                                                     aValue, aTimestamp, aFlags);
     }
     return rc;
@@ -3148 +3154 @@
         BSTR dummy = NULL;
         ULONG64 dummy64;
-        rc = directControl->AccessGuestProperty (aName, aValue, aFlags,
-                                                 true /* isSetter */,
-                                                 &dummy, &dummy64, &dummy);
+        if (!directControl)
+            rc = E_FAIL;
+        else
+            rc = directControl->AccessGuestProperty (aName, aValue, aFlags,
+                                                     true /* isSetter */,
+                                                     &dummy, &dummy64, &dummy);
     }
     return rc;
@@ -3240 +3249 @@
         alock.unlock();
 
-        rc = directControl->EnumerateGuestProperties (aPatterns,
-                                                      ComSafeArrayOutArg (aNames),
-                                                      ComSafeArrayOutArg (aValues),
-                                                      ComSafeArrayOutArg (aTimestamps),
-                                                      ComSafeArrayOutArg (aFlags));
+        if (!directControl)
+            rc = E_FAIL;
+        else
+            rc = directControl->EnumerateGuestProperties (aPatterns,
+                                                          ComSafeArrayOutArg (aNames),
+                                                          ComSafeArrayOutArg (aValues),
+                                                          ComSafeArrayOutArg (aTimestamps),
+                                                          ComSafeArrayOutArg (aFlags));
     }
     return rc;