Changeset 23729 in vbox

Timestamp:

Oct 13, 2009 2:31:26 PM (15 years ago)

Author:

vboxsync

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

53449

Message:

SSM: Fixed assertion in ssmR3StrmClose when called from SSMR3Close.

File:

• trunk/src/VBox/VMM/SSM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/SSM.cpp

@@ -2077 +2077 @@
     if (pStrm->fWrite)
     {
-        int rc2 = RTSemEventSignal(pStrm->hEvtHead);                            AssertLogRelRC(rc2);
-        int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);     AssertLogRelRC(rc3);
-        pStrm->hIoThread = NIL_RTTHREAD;
+        if (pStrm->hIoThread != NIL_RTTHREAD)
+        {
+            int rc2 = RTSemEventSignal(pStrm->hEvtHead);
+            AssertLogRelRC(rc2);
+            int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);
+            AssertLogRelRC(rc3);
+            pStrm->hIoThread = NIL_RTTHREAD;
+        }
 
         rc = pStrm->pOps->pfnClose(pStrm->pvUser);
@@ -2091 +2096 @@
             ssmR3StrmSetError(pStrm, rc);
 
-        int rc2 = RTSemEventSignal(pStrm->hEvtFree);                            AssertLogRelRC(rc2);
-        int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);     AssertLogRelRC(rc3);
-        pStrm->hIoThread = NIL_RTTHREAD;
+        if (pStrm->hIoThread != NIL_RTTHREAD)
+        {
+            int rc2 = RTSemEventSignal(pStrm->hEvtHead);
+            AssertLogRelRC(rc2);
+            int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);
+            AssertLogRelRC(rc3);
+            pStrm->hIoThread = NIL_RTTHREAD;
+        }
     }