Changeset 76670 in vbox for trunk

Timestamp:

Jan 7, 2019 11:01:21 AM (6 years ago)

Author:

vboxsync

Message:

Audio/PulseAudio: Bail out early in device enumeration when we're unable to get the PulseAudio server information for whatever reason.

File:

• trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (1 diff)

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

@@ -1143 +1143 @@
 
     pThis->fEnumOpSuccess = false;
-    int rc = paWaitFor(pThis, pa_context_get_server_info(pThis->pContext, paEnumServerCb, &CbCtx));
+
+    LogRel(("PulseAudio: Retrieving server information ...\n"));
+
+    /* Check if server information is available and bail out early if it isn't. */
+    pa_operation *paOpServerInfo = pa_context_get_server_info(pThis->pContext, paEnumServerCb, &CbCtx);
+    if (!paOpServerInfo)
+    {
+        pa_threaded_mainloop_unlock(pThis->pMainLoop);
+
+        LogRel(("PulseAudio: Server information not available, skipping enumeration\n"));
+        return VINF_SUCCESS;
+    }
+
+    int rc = paWaitFor(pThis, paOpServerInfo);
     if (RT_SUCCESS(rc) && !pThis->fEnumOpSuccess)
         rc = VERR_AUDIO_BACKEND_INIT_FAILED; /* error code does not matter */