Changeset 35034 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 13, 2010 4:41:17 PM (14 years ago)

Author:

vboxsync

Message:

ConsoleImpl.h: Made the SafeVMPtr and SafeVMPtrQuiet safer by checking that the VM pointer isn't NULL after retriving it.

File:

• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (6 diffs)

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

@@ -313 +313 @@
      *  @sa SafeVMPtr, SafeVMPtrQuiet
      */
-    typedef AutoVMCallerBase <false, false> AutoVMCaller;
+    typedef AutoVMCallerBase<false, false> AutoVMCaller;
 
     /**
@@ -320 +320 @@
      *  @note Temporarily locks the argument for writing.
      */
-    typedef AutoVMCallerBase <true, false> AutoVMCallerQuiet;
+    typedef AutoVMCallerBase<true, false> AutoVMCallerQuiet;
 
     /**
@@ -328 +328 @@
      *  @note Temporarily locks the argument for writing.
      */
-    typedef AutoVMCallerBase <false, true> AutoVMCallerWeak;
+    typedef AutoVMCallerBase<false, true> AutoVMCallerWeak;
 
     /**
@@ -337 +337 @@
      *  @note Temporarily locks the argument for writing.
      */
-    typedef AutoVMCallerBase <true, true> AutoVMCallerQuietWeak;
+    typedef AutoVMCallerBase<true, true> AutoVMCallerQuietWeak;
 
     /**
      *  Base template for SaveVMPtr and SaveVMPtrQuiet.
      */
-    template <bool taQuiet = false>
-    class SafeVMPtrBase : public AutoVMCallerBase <taQuiet, true>
+    template<bool taQuiet = false>
+    class SafeVMPtrBase : public AutoVMCallerBase<taQuiet, true>
     {
-        typedef AutoVMCallerBase <taQuiet, true> Base;
+        typedef AutoVMCallerBase<taQuiet, true> Base;
     public:
         SafeVMPtrBase(Console *aThat) : Base(aThat), mpVM(NULL)
         {
             if (SUCCEEDED(Base::mRC))
+            {
                 mpVM = aThat->mpVM;
+                if (!mpVM)
+                    Base::mRC = E_FAIL; /** @todo use setError here. */
+            }
         }
         /** Smart SaveVMPtr to PVM cast operator */
@@ -381 +385 @@
      *  @sa SafeVMPtrQuiet, AutoVMCaller
      */
-    typedef SafeVMPtrBase <false> SafeVMPtr;
+    typedef SafeVMPtrBase<false> SafeVMPtr;
 
     /**
@@ -398 +402 @@
      *  @sa SafeVMPtr, AutoVMCaller
      */
-    typedef SafeVMPtrBase <true> SafeVMPtrQuiet;
+    typedef SafeVMPtrBase<true> SafeVMPtrQuiet;
 
     class SharedFolderData