Changeset 25768 in vbox

Timestamp:

Jan 12, 2010 2:19:08 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56525

Message:

Devices/pulseaudio: protect against killing the pulseaudio daemon during record

File:

• trunk/src/VBox/Devices/Audio/pulseaudio.c (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/pulseaudio.c

@@ -278 +278 @@
     if (fIn)
     {
-        LogRel(("Pulse: Obtained buffer attributes for recording: maxlength=%d fragsize=%d\n",
+        LogRel(("Pulse:  Obtained record buffer attributes: maxlength=%d fragsize=%d\n",
             pBufAttr->maxlength, pBufAttr->fragsize));
     }
     else
     {
-        LogRel(("Pulse: Obtained buffer attributes for playback: maxlength=%d tlength=%d prebuf=%d minreq=%d\n",
+        LogRel(("Pulse:  Obtained playback buffer attributes: maxlength=%d tlength=%d prebuf=%d minreq=%d\n",
             pBufAttr->maxlength, pBufAttr->tlength, pBufAttr->prebuf, pBufAttr->minreq));
     }
@@ -556 +556 @@
     pa_threaded_mainloop_unlock(g_pMainLoop);
 
+    if (cFramesAvail == -1)
+    {
+        if (pPulse->cErrors < MAX_LOG_REL_ERRORS)
+        {
+            int rc = pa_context_errno(g_pContext);
+            pPulse->cErrors++;
+            LogRel(("Pulse: Failed to determine the readable size: %s\n",
+                     pa_strerror(rc)));
+        }
+        return 0;
+    }
+
     /* If the buffer was not dropped last call, add what remains */
     if (pPulse->pu8PeekBuf)
@@ -570 +582 @@
             pa_threaded_mainloop_unlock(g_pMainLoop);
             pPulse->offPeekBuf = 0;
-            if (!pPulse->cbPeekBuf)
+            if (   !pPulse->pu8PeekBuf
+                || !pPulse->cbPeekBuf)
                 break;
         }