Changeset 64349 in vbox for trunk/src

Timestamp:

Oct 21, 2016 10:05:29 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DevIchAc97.cpp: Fixed crashes on destruction.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -743 +743 @@
     LogFlowFuncEnter();
 
-    PAUDMIXSINK pSink;
     switch (enmRecSource)
     {
         case PDMAUDIORECSOURCE_MIC:
-            pSink = pThis->pSinkMicIn;
-            break;
+            AudioMixerSinkDestroy(pThis->pSinkMicIn);
+            pThis->pSinkMicIn = NULL;
+            break;
+
         case PDMAUDIORECSOURCE_LINE:
-            pSink = pThis->pSinkLineIn;
-            break;
+            AudioMixerSinkDestroy(pThis->pSinkLineIn);
+            pThis->pSinkLineIn = NULL;
+            break;
+
         default:
             AssertMsgFailed(("Audio source %ld not supported\n", enmRecSource));
@@ -766 +769 @@
             pStream = &pDrv->LineIn;
 
-        if (pStream->pMixStrm)
-        {
-            AudioMixerSinkRemoveStream(pSink, pStream->pMixStrm);
-            AudioMixerStreamDestroy(pStream->pMixStrm);
-        }
         pStream->pMixStrm = NULL;
     }
@@ -780 +778 @@
 
     LogFlowFuncEnter();
+
+    AudioMixerSinkDestroy(pThis->pSinkOut);
+    pThis->pSinkOut = NULL;
 
     PAC97DRIVER pDrv;
     RTListForEach(&pThis->lstDrv, pDrv, AC97DRIVER, Node)
     {
-        if (pDrv->Out.pMixStrm)
-        {
-            AudioMixerSinkRemoveStream(pThis->pSinkOut, pDrv->Out.pMixStrm);
-            AudioMixerStreamDestroy(pDrv->Out.pMixStrm);
-
-            pDrv->Out.pMixStrm = NULL;
-        }
+        pDrv->Out.pMixStrm = NULL;
     }
 }
@@ -2480 +2475 @@
     LogRel2(("AC97: Powering off ...\n"));
 
+    /* Note: Involves mixer stream / sink destruction, so also do this here
+     *       instead of in ichac97Destruct(). */
+    ichac97StreamsDestroy(pThis);
+
     /**
      * Note: Destroy the mixer while powering off and *not* in ichac97Destruct,
@@ -2538 +2537 @@
 
     LogFlowFuncEnter();
-
-    ichac97StreamsDestroy(pThis);
 
     PAC97DRIVER pDrv, pDrvNext;