Changeset 58573 in vbox for trunk/src/VBox/Devices/Audio/AudioMixer.cpp

Timestamp:

Nov 4, 2015 5:15:34 PM (9 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Try to fix a crash (for bugref:8054).

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (2 diffs)

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

@@ -349 +349 @@
         return;
 
-    PAUDMIXSTREAM pStream = RTListGetFirst(&pSink->lstStreams, AUDMIXSTREAM, Node);
-    while (pStream)
-    {
-        PAUDMIXSTREAM pNext = RTListNodeGetNext(&pStream->Node, AUDMIXSTREAM, Node);
-        bool fLast = RTListNodeIsLast(&pSink->lstStreams, &pStream->Node);
-
+    PAUDMIXSTREAM pStream, pStreamNext;
+    RTListForEachSafe(&pSink->lstStreams, pStream, pStreamNext, AUDMIXSTREAM, Node)
         AudioMixerRemoveStream(pSink, pStream);
-
-        if (fLast)
-            break;
-
-        pStream = pNext;
-    }
 
     Assert(pSink->cStreams == 0);
@@ -385 +375 @@
     pSink->cStreams--;
 
+#ifdef DEBUG
     const char *pszStream = pSink->enmDir == AUDMIXSINKDIR_INPUT
                           ? pStream->pIn->MixBuf.pszName : pStream->pOut->MixBuf.pszName;
 
     LogFlowFunc(("%s: pStream=%s, cStreams=%RU8\n",
-                 pSink->pszName, pszStream, pSink->cStreams));
+                 pSink->pszName, pszStream ? pszStream : "<Unnamed>", pSink->cStreams));
+#endif
 
     audioMixerDestroyStream(pStream);