forked from pool/pulseaudio
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
|
From a2418effe7c4bc54390939ccd07dd6227e6cdfa5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel T Chen <crimsun@ubuntu.com>
|
||
|
|
Date: Mon, 4 Jan 2010 21:44:37 -0500
|
||
|
|
Subject: [PATCH] threaded-mainloop: Properly initialise m->n_waiting_for_accept to prevent deadlock
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=utf-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Compiler optimisations have been seen to initialise
|
||
|
|
m->n_waiting_for_accept to a positive non-zero value, so the while() in
|
||
|
|
pa_threaded_mainloop_signal() never proceeds. Fix this by properly
|
||
|
|
initializing m->n_waiting_for_accept in pa_threaded_mainloop_new().
|
||
|
|
|
||
|
|
Patch from Iain Bucław.
|
||
|
|
|
||
|
|
https://bugs.launchpad.net/bugs/502992
|
||
|
|
---
|
||
|
|
src/pulse/thread-mainloop.c | 1 +
|
||
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
|
||
|
|
index 14ed926..1693404 100644
|
||
|
|
--- a/src/pulse/thread-mainloop.c
|
||
|
|
+++ b/src/pulse/thread-mainloop.c
|
||
|
|
@@ -116,6 +116,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
|
||
|
|
pa_mainloop_set_poll_func(m->real_mainloop, poll_func, m->mutex);
|
||
|
|
|
||
|
|
m->n_waiting = 0;
|
||
|
|
+ m->n_waiting_for_accept = 0;
|
||
|
|
|
||
|
|
return m;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.6.0.2
|
||
|
|
|