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

Timestamp:

Jan 20, 2017 3:03:00 PM (8 years ago)

Author:

vboxsync

Message:

Main/Machine+Medium: must not touch the refcount of the current object in the uninit method if it was called from the FinalRelease method

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (1 diff)

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

@@ -12587 +12587 @@
      *  This self reference will be released as the very last step on return.
      */
-    ComObjPtr<SessionMachine> selfRef = this;
+    ComObjPtr<SessionMachine> selfRef;
+    if (aReason != Uninit::Unexpected)
+        selfRef = this;
 
     /* Enclose the state transition Ready->InUninit->NotReady */

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

@@ -1592 +1592 @@
      * re-acquired in the right place later. See Medium::getParent() for sample
      * code how to do this safely. */
-    ComObjPtr<VirtualBox> pVirtualBox(m->pVirtualBox);
+    VirtualBox *pVirtualBox = m->pVirtualBox;
     if (!pVirtualBox)
         return;