Changeset 82588 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 16, 2019 4:37:11 PM (5 years ago)

Author:

vboxsync

Message:

AudioMixer: Fix for regression from r135308. Must not forget to NULL pSink->In.pStreamRecSource when pStream is NULL, or we'll end up trying to use pConn after it has be set to NULL and the structure freed. bugref:9625

File:

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

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

@@ -1502 +1502 @@
     if (RT_SUCCESS(rc))
     {
-        if (pStream) /* Can be NULL if un-setting. */
+        if (pStream)
         {
             AssertPtr(pStream->pStream);
@@ -1509 +1509 @@
             rc = pStream->pConn->pfnEnable(pStream->pConn, PDMAUDIODIR_IN, true /* Enable */);
             if (RT_SUCCESS(rc))
-            {
                 pSink->In.pStreamRecSource = pStream;
-            }
             else if (pSink->In.pStreamRecSource->pConn) /* Stay with the current recording source (if any) and re-enable it. */
             {
@@ -1519 +1517 @@
             }
         }
+        else
+            pSink->In.pStreamRecSource = NULL; /* Unsetting, see audioMixerSinkRemoveStreamInternal. */
     }
 
@@ -1525 +1525 @@
 
     if (RT_SUCCESS(rc))
-    {
         LogRel(("Audio Mixer: Setting recording source of sink '%s' to '%s'\n",
                 pSink->pszName, pSink->In.pStreamRecSource ? pSink->In.pStreamRecSource->pszName : "<None>"));
-    }
     else if (rc != VERR_AUDIO_STREAM_NOT_READY)
-    {
         LogRel(("Audio Mixer: Setting recording source of sink '%s' to '%s' failed with %Rrc\n",
                 pSink->pszName, pSink->In.pStreamRecSource ? pSink->In.pStreamRecSource->pszName : "<None>", rc));
-    }
 
     return rc;