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

Timestamp:

Dec 2, 2018 1:03:43 AM (6 years ago)

Author:

vboxsync

Message:

DevHDA: Fix for crash saving circular stream buffers.

File:

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

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

@@ -3631 +3631 @@
          * So get the current read offset and serialize the buffer data manually based on that.
          */
-        size_t cbCircBufOffRead = RTCircBufOffsetRead(pStream->State.pCircBuf);
-
+        size_t const offBuf = RTCircBufOffsetRead(pStream->State.pCircBuf);
         void  *pvBuf;
         size_t cbBuf;
         RTCircBufAcquireReadBlock(pStream->State.pCircBuf, cbCircBufUsed, &pvBuf, &cbBuf);
+#if 0 /** @todo r=bird: The disabled code crashes on me. The #else case contains something that seems
+       * to make more sense to me.  I'm not say this is correct code.  Please review, fix, and remove. */
 
         if (cbBuf)
@@ -3642 +3643 @@
             size_t cbEnd    = 0;
 
-            if (cbCircBufUsed > cbCircBufOffRead)
-                cbEnd = cbCircBufUsed - cbCircBufOffRead;
+            if (cbCircBufUsed > offBuf)
+                cbEnd = cbCircBufUsed - offBuf;
 
             if (cbEnd) /* Save end of buffer first. */
@@ -3660 +3661 @@
             }
         }
+#else
+        Assert(cbBuf);
+        rc = SSMR3PutMem(pSSM, pvBuf, cbBuf);
+        if (cbBuf < cbCircBufUsed)
+            rc = SSMR3PutMem(pSSM, (uint8_t *)pvBuf - offBuf, cbCircBufUsed - cbBuf);
+#endif
 
         RTCircBufReleaseReadBlock(pStream->State.pCircBuf, 0 /* Don't advance read pointer -- see comment above */);