mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tunnel-sink-new: Fix a possible crash

Browse source 
When the creation of u->thread fails, then pa_thread_mq_done() in
pa__done() will crash, because pa_thread_mq_init() was never called.
Allocating the thread_mq object separately, instead of embedding it
in the userdata struct, allows pa__done() to call pa_thread_mq_done()
only when necessary.
This commit is contained in:
Alexander Couzens 2013-09-16 13:06:27 +02:00 • committed by Tanu Kaskinen
parent 0c3f3934f5
commit 3fd2004603
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/module-tunnel-sink-new.c
View file

@ -71,7 +71,7 @@ struct userdata {
pa_module *module; pa_module *module;
pa_sink *sink; pa_sink *sink;
pa_thread *thread; pa_thread *thread;
pa_thread_mq thread_mq; pa_thread_mq *thread_mq;
pa_mainloop *thread_mainloop; pa_mainloop *thread_mainloop;
pa_mainloop_api *thread_mainloop_api; pa_mainloop_api *thread_mainloop_api;
@ -126,7 +126,7 @@ static void thread_func(void *userdata) {
pa_assert(u); pa_assert(u);
pa_log_debug("Thread starting up"); pa_log_debug("Thread starting up");
pa_thread_mq_install(&u->thread_mq); pa_thread_mq_install(u->thread_mq);
proplist = tunnel_new_proplist(u); proplist = tunnel_new_proplist(u);
u->context = pa_context_new_with_proplist(u->thread_mainloop_api, u->context = pa_context_new_with_proplist(u->thread_mainloop_api,
@ -203,8 +203,8 @@ static void thread_func(void *userdata) {
} }
} }
fail: fail:
pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->module->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); pa_asyncmsgq_post(u->thread_mq->outq, PA_MSGOBJECT(u->module->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL);
pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN); pa_asyncmsgq_wait_for(u->thread_mq->inq, PA_MESSAGE_SHUTDOWN);
finish: finish:
if (u->stream) { if (u->stream) {
@ -453,7 +453,8 @@ int pa__init(pa_module *m) {
u->remote_sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); u->remote_sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
pa_thread_mq_init_thread_mainloop(&u->thread_mq, m->core->mainloop, u->thread_mainloop_api); u->thread_mq = pa_xnew0(pa_thread_mq, 1);
pa_thread_mq_init_thread_mainloop(u->thread_mq, m->core->mainloop, u->thread_mainloop_api);
/* Create sink */ /* Create sink */
pa_sink_new_data_init(&sink_data); pa_sink_new_data_init(&sink_data);
@ -491,7 +492,7 @@ int pa__init(pa_module *m) {
u->sink->update_requested_latency = sink_update_requested_latency_cb; u->sink->update_requested_latency = sink_update_requested_latency_cb;
/* set thread message queue */ /* set thread message queue */
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_asyncmsgq(u->sink, u->thread_mq->inq);
if (!(u->thread = pa_thread_new("tunnel-sink", thread_func, u))) { if (!(u->thread = pa_thread_new("tunnel-sink", thread_func, u))) {
pa_log("Failed to create thread."); pa_log("Failed to create thread.");
@ -528,11 +529,14 @@ void pa__done(pa_module *m) {
pa_sink_unlink(u->sink); pa_sink_unlink(u->sink);
if (u->thread) { if (u->thread) {
pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_asyncmsgq_send(u->thread_mq->inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
pa_thread_free(u->thread); pa_thread_free(u->thread);
} }
pa_thread_mq_done(&u->thread_mq); if (u->thread_mq) {
pa_thread_mq_done(u->thread_mq);
pa_xfree(u->thread_mq);
}
if (u->thread_mainloop) if (u->thread_mainloop)
pa_mainloop_free(u->thread_mainloop); pa_mainloop_free(u->thread_mainloop);