Changeset 62054 in vbox for trunk/src/VBox/Devices/Audio/DrvAudio.cpp

Timestamp:

Jul 6, 2016 12:50:12 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Fixed crashing on driver version mismatch.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (3 diffs)

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

@@ -1706 +1706 @@
     if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)
     {
+        /* Check if the pointer to  the host audio driver is still valid.
+         * It can be NULL if we were called in drvAudioDestruct, for example. */
         if (pThis->pHostDrvAudio)
             rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pHstStream);
@@ -1901 +1903 @@
     AssertRC(rc2);
 
-    PPDMAUDIOSTREAM pStream, pStreamNext;
-    RTListForEachSafe(&pThis->lstHstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
-        drvAudioStreamDestroyInternal(pThis, pStream);
-
-    RTListForEachSafe(&pThis->lstGstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
-        drvAudioStreamDestroyInternal(pThis, pStream);
-
     /*
      * Note: No calls here to the driver below us anymore,
@@ -1915 +1910 @@
      */
 
-    /* Sanity. */
-    Assert(RTListIsEmpty(&pThis->lstHstStreams));
-    Assert(RTListIsEmpty(&pThis->lstGstStreams));
+    /* Thus, NULL the pointer to the host audio driver first,
+     * so that routines like drvAudioStreamDestroyInternal() don't call the driver(s) below us anymore. */
+    pThis->pHostDrvAudio = NULL;
+
+    PPDMAUDIOSTREAM pStream, pStreamNext;
+    RTListForEachSafe(&pThis->lstHstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
+        drvAudioStreamDestroyInternal(pThis, pStream);
+
+    RTListForEachSafe(&pThis->lstGstStreams, pStream, pStreamNext, PDMAUDIOSTREAM, Node)
+        drvAudioStreamDestroyInternal(pThis, pStream);
 
 #ifdef VBOX_WITH_AUDIO_CALLBACKS