[pulseaudio-discuss] [PATCH 5/6] srbchannel: Fix assertion failure when HAVE_CREDS is undefined

Ahmed S. Darwish darwish.07 at gmail.com
Sun Mar 13 22:01:06 UTC 2016


Gracefully stop srbchannel setup if credentials-passing support
is unavailable instead.

Signed-off-by: Ahmed S. Darwish <darwish.07 at gmail.com>
---

Notes:
    Assertion failure is at pa_pstream_send_tagstruct_with_fds()
    which just calls pa_assert_not_reached() if HAVE_CREDS is
    undefined.

 src/pulsecore/protocol-native.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 145db04..b139be9 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -2585,6 +2585,7 @@ static void command_exit(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_ta
 }
 
 static void setup_srbchannel(pa_native_connection *c) {
+#ifdef HAVE_CREDS
     pa_srbchannel_template srbt;
     pa_srbchannel *srb;
     pa_memchunk mc;
@@ -2634,6 +2635,9 @@ static void setup_srbchannel(pa_native_connection *c) {
     pa_pstream_send_memblock(c->pstream, 0, 0, 0, &mc);
 
     c->srbpending = srb;
+#else
+    pa_log_debug("Disabling srbchannel, reason: No credentials-passing support");
+#endif
 }
 
 static void command_enable_srbchannel(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {


Regards,

--
Darwish
http://darwish.chasingpointers.com


More information about the pulseaudio-discuss mailing list