Changeset 67909 in vbox

Timestamp:

Jul 11, 2017 2:38:55 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvHostPulseAudio.cpp: Added additional check for writable size in drvHostPulseAudioStreamPlay().

File:

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

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

@@ -889 +889 @@
         }
 
-        size_t cbToWrite = RT_MIN(cbWriteable, cbBuf);
-
-        uint32_t cbWritten;
-        while (cbToWrite)
-        {
-            cbWritten = cbToWrite;
-            if (pa_stream_write(pPAStream->pStream, (uint8_t *)pvBuf + cbWrittenTotal, cbWritten, NULL /* Cleanup callback */,
+        size_t cbLeft = RT_MIN(cbWriteable, cbBuf);
+
+        while (cbLeft)
+        {
+            size_t cbToWrite = RT_MIN(cbLeft, pa_stream_writable_size(pPAStream->pStream));
+            if (cbToWrite <= (size_t)0)
+                break;
+
+            if (pa_stream_write(pPAStream->pStream, (uint8_t *)pvBuf + cbWrittenTotal, cbToWrite, NULL /* Cleanup callback */,
                                 0, PA_SEEK_RELATIVE) < 0)
             {
@@ -902 +904 @@
             }
 
-            Assert(cbToWrite >= cbWritten);
-            cbToWrite      -= cbWritten;
-            cbWrittenTotal += cbWritten;
+            Assert(cbLeft  >= cbToWrite);
+            cbLeft         -= cbToWrite;
+            cbWrittenTotal += cbToWrite;
         }