Changeset 89354 in vbox

Timestamp:

May 28, 2021 12:57:55 PM (4 years ago)

Author:

vboxsync

Message:

AudioMixBuffer: Fix. bugref:9890

File:

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

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

@@ -924 +924 @@
  * Destroys (uninitializes) a mixing buffer.
  *
- * @param   pMixBuf                 Mixing buffer to destroy.
+ * @param   pMixBuf     The mixing buffer.  Uninitialized mixer buffers will be
+ *                      quietly ignored.  As will NULL.
  */
 void AudioMixBufDestroy(PAUDIOMIXBUF pMixBuf)
@@ -933 +934 @@
     /* Ignore calls for an uninitialized (zeroed) or already destroyed instance.  Happens a lot. */
     if (   pMixBuf->uMagic == 0
-        || pMixBuf->uMagic == ~AUDIOMIXBUF_MAGIC)
+        || pMixBuf->uMagic == AUDIOMIXBUF_MAGIC_DEAD)
     {
         Assert(!pMixBuf->pszName);
@@ -969 +970 @@
  * This will reset the read and write offsets to zero.
  *
- * @param   pMixBuf             The mixing buffer.
+ * @param   pMixBuf     The mixing buffer.  Uninitialized mixer buffers will be
+ *                      quietly ignored.
  */
 void AudioMixBufDrop(PAUDIOMIXBUF pMixBuf)
 {
     AssertPtrReturnVoid(pMixBuf);
-    AssertReturnVoid(pMixBuf->uMagic == AUDIOMIXBUF_MAGIC);
+
+    /* Ignore uninitialized (zeroed) mixer sink buffers (happens with AC'97 during VM construction). */
+    if (   pMixBuf->uMagic == 0
+        || pMixBuf->uMagic == AUDIOMIXBUF_MAGIC_DEAD)
+        return;
 
     AUDMIXBUF_LOG(("%s\n", pMixBuf->pszName));