Changeset 73785 in vbox for trunk

Timestamp:

Aug 20, 2018 1:14:35 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Don't clear (finish) more input frames than available in drvAudioStreamRead(); should help wrt testbox crashes.

File:

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

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

@@ -2303 +2303 @@
         }
 
+        if (cfReadTotal)
+        {
+            if (pThis->In.Cfg.Dbg.fEnabled)
+                DrvAudioHlpFileWrite(pStream->In.Dbg.pFileStreamRead,
+                                     pvBuf, AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal), 0 /* fFlags */);
+
+            AudioMixBufFinish(&pStream->Guest.MixBuf, cfReadTotal);
+        }
+
         /* If we were not able to read as much data as requested, fill up the returned
          * data with silence.
@@ -2321 +2330 @@
         }
 
-        if (cfReadTotal)
-        {
-            if (pThis->In.Cfg.Dbg.fEnabled)
-                DrvAudioHlpFileWrite(pStream->In.Dbg.pFileStreamRead,
-                                     pvBuf, AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal), 0 /* fFlags */);
-
-            AudioMixBufFinish(&pStream->Guest.MixBuf, cfReadTotal);
-
-            cbReadTotal = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal);
-        }
+        cbReadTotal = AUDIOMIXBUF_F2B(&pStream->Guest.MixBuf, cfReadTotal);
 
         pStream->tsLastReadWrittenNs = RTTimeNanoTS();