diff options
Diffstat (limited to 'media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch')
| -rw-r--r-- | media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch deleted file mode 100644 index 6bdd46415cd2..000000000000 --- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b75a20db10c8605d98324a7782a7da6483ae9f14 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Wed, 19 Mar 2014 09:50:39 +0200 -Subject: zeroconf-publish: Don't assume any particular defer event ordering - -Also, initialize userdata with zeros to avoid invalid pointers in -client_free(). - -This fixes a crash when client_free() is called before -create_client(). The whole issue could be avoided by using some other -mechanism than defer events for running the two functions, but I'll -do that change later (I have also other cleanups planned for -zeroconf-publish). - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184 - -diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c -index db92850..be8806e 100644 ---- a/src/modules/module-zeroconf-publish.c -+++ b/src/modules/module-zeroconf-publish.c -@@ -142,7 +142,8 @@ struct userdata { - - pa_native_protocol *native; - -- bool shutting_down; -+ bool shutting_down; /* Used in the main thread. */ -+ bool client_freed; /* Used in the Avahi thread. */ - }; - - /* Runs in PA mainloop context */ -@@ -707,6 +708,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { - struct userdata *u = (struct userdata *) userdata; - int error; - -+ /* create_client() and client_free() are called via defer events. If the -+ * two defer events are created very quickly one after another, we can't -+ * assume that the defer event that runs create_client() will be dispatched -+ * before the defer event that runs client_free() (at the time of writing, -+ * pa_mainloop actually always dispatches queued defer events in reverse -+ * creation order). For that reason we must be prepared for the case where -+ * client_free() has already been called. */ -+ if (u->client_freed) -+ return; -+ - pa_thread_mq_install(&u->thread_mq); - - if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) { -@@ -733,7 +744,7 @@ int pa__init(pa_module*m) { - goto fail; - } - -- m->userdata = u = pa_xnew(struct userdata, 1); -+ m->userdata = u = pa_xnew0(struct userdata, 1); - u->core = m->core; - u->module = m; - u->native = pa_native_protocol_get(u->core); -@@ -757,8 +768,6 @@ int pa__init(pa_module*m) { - u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u); - u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u); - -- u->main_entry_group = NULL; -- - un = pa_get_user_name_malloc(); - hn = pa_get_host_name_malloc(); - u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1); -@@ -801,6 +810,8 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) { - pa_avahi_poll_free(u->avahi_poll); - - pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL); -+ -+ u->client_freed = true; - } - - void pa__done(pa_module*m) { --- -cgit v0.10.2 - |