Changeset 30292 in vbox for trunk

Timestamp:

Jun 17, 2010 6:45:15 PM (15 years ago)

Author:

vboxsync

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

62821

Message:

Main/Medium: add a couple of forgotten AutoCaller objects to fix extremely sporadic crashes

File:

• trunk/src/VBox/Main/MediumImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1901 +1901 @@
 STDMETHODIMP Medium::Close()
 {
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
     // we're accessing parent/child and backrefs, so lock the tree first, then ourselves
     AutoMultiWriteLock2 multilock(&m->pVirtualBox->getMediaTreeLockHandle(),
@@ -1941 +1944 @@
     // make a copy of VirtualBox pointer which gets nulled by uninit()
     ComObjPtr<VirtualBox> pVirtualBox(m->pVirtualBox);
+
+    // leave the AutoCaller, as otherwise uninit() will simply hang
+    autoCaller.release();
 
     /* Keep the locks held until after uninit, as otherwise the consistency
@@ -3131 +3137 @@
                                      MediumLockList &mediumLockList)
 {
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
     HRESULT rc = S_OK;
 
@@ -3846 +3855 @@
 {
     AssertReturn(aProgress != NULL || aWait == true, E_FAIL);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     HRESULT rc = S_OK;
@@ -4609 +4621 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
+    AutoCaller targetCaller(pTarget);
+    AssertComRCReturnRC(targetCaller.rc());
+
     HRESULT rc = S_OK;
     ComObjPtr <Progress> pProgress;