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

zeroconf-publish: Don't react to messages while shutting down

Browse source 
This fixes a case where pa__done() is called while
AVAHI_MESSAGE_PUBLISH_ALL is waiting for processing. The
pa_asyncmsgq_wait_for(AVAHI_MESSAGE_SHUTDOWN_COMPLETE) call will
process all pending messages, and processing AVAHI_MESSAGE_PUBLISH_ALL
causes publish_all_services(), and that in turn accesses u->services,
which has been already freed at this point. If we are shutting down,
we shouldn't react to any of the messages that the Avahi thread is
sending to the main thread.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184
This commit is contained in:
Tanu Kaskinen 2014-03-15 09:37:06 +02:00
parent d03ffdccdb
commit 37e73e10be
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-zeroconf-publish.c
View file

@ -141,6 +141,8 @@ struct userdata {
pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot; pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot;
pa_native_protocol *native; pa_native_protocol *native;
bool shutting_down;
}; };
/* Runs in PA mainloop context */ /* Runs in PA mainloop context */
@ -638,6 +640,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) {
static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
struct userdata *u = (struct userdata *) data; struct userdata *u = (struct userdata *) data;
pa_assert(u);
if (u->shutting_down)
return 0;
switch (code) { switch (code) {
case AVAHI_MESSAGE_PUBLISH_ALL: case AVAHI_MESSAGE_PUBLISH_ALL:
publish_all_services(u); publish_all_services(u);
@ -647,10 +654,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
pa_module_unload(u->core, u->module, true); pa_module_unload(u->core, u->module, true);
break; break;
case AVAHI_MESSAGE_SHUTDOWN_COMPLETE:
/* pa__done() is waiting for this */
break;
default: default:
pa_assert_not_reached(); pa_assert_not_reached();
} }
@ -797,7 +800,7 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
if (u->avahi_poll) if (u->avahi_poll)
pa_avahi_poll_free(u->avahi_poll); pa_avahi_poll_free(u->avahi_poll);
pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL); pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
} }
void pa__done(pa_module*m) { void pa__done(pa_module*m) {
@ -807,6 +810,8 @@ void pa__done(pa_module*m) {
if (!(u = m->userdata)) if (!(u = m->userdata))
return; return;
u->shutting_down = true;
pa_threaded_mainloop_lock(u->mainloop); pa_threaded_mainloop_lock(u->mainloop);
pa_mainloop_api_once(u->api, client_free, u); pa_mainloop_api_once(u->api, client_free, u);
pa_threaded_mainloop_unlock(u->mainloop); pa_threaded_mainloop_unlock(u->mainloop);