Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
pulseaudio
0001-dbus-remove-filter-functions-only-if-they-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-dbus-remove-filter-functions-only-if-they-were-actu.patch of Package pulseaudio
From c41ee00893b6b0d5cc48ee041b8e4835eac548f0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering <lennart@poettering.net> Date: Fri, 8 Jan 2010 20:06:21 +0100 Subject: [PATCH] dbus: remove filter functions only if they were actually set before This fixes an assert when destructing modules that have not been fully initialized. https://bugzilla.redhat.com/show_bug.cgi?id=548525 --- src/modules/bluetooth/bluetooth-util.c | 5 +++- src/modules/bluetooth/module-bluetooth-device.c | 7 ++++- src/modules/bluetooth/module-bluetooth-proximity.c | 11 ++++---- src/modules/module-console-kit.c | 9 +++++- src/modules/module-hal-detect.c | 10 ++++---- src/pulse/context.c | 25 ++++--------------- src/pulse/internal.h | 1 + 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 47d6200..795d510 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -37,6 +37,7 @@ struct pa_bluetooth_discovery { PA_LLIST_HEAD(pa_dbus_pending, pending); pa_hashmap *devices; pa_hook hook; + pa_bool_t filter_added; }; static void get_properties_reply(DBusPendingCall *pending, void *userdata); @@ -788,6 +789,7 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) { pa_log_error("Failed to add filter function"); goto fail; } + y->filter_added = TRUE; if (pa_dbus_add_matches( pa_dbus_connection_get(y->connection), &err, @@ -856,7 +858,8 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) { "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", "type='signal',sender='org.bluez',interface='org.bluez.AudioSource',member='PropertyChanged'", NULL); - dbus_connection_remove_filter(pa_dbus_connection_get(y->connection), filter_cb, y); + if (y->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(y->connection), filter_cb, y); pa_dbus_connection_unref(y->connection); } diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 0ba1421..19676df 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -179,6 +179,8 @@ struct userdata { int stream_write_type; int service_write_type, service_read_type; + + pa_bool_t filter_added; }; #define FIXED_LATENCY_PLAYBACK_A2DP (25*PA_USEC_PER_MSEC) @@ -2405,6 +2407,7 @@ int pa__init(pa_module* m) { pa_log_error("Failed to add filter function"); goto fail; } + u->filter_added = TRUE; speaker = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='SpeakerGainChanged',path='%s'", u->path); mike = pa_sprintf_malloc("type='signal',sender='org.bluez',interface='org.bluez.Headset',member='MicrophoneGainChanged',path='%s'", u->path); @@ -2494,7 +2497,9 @@ void pa__done(pa_module *m) { pa_xfree(mike); } - dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + if (u->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + pa_dbus_connection_unref(u->connection); } diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c index c4cfd73..3eed9ce 100644 --- a/src/modules/bluetooth/module-bluetooth-proximity.c +++ b/src/modules/bluetooth/module-bluetooth-proximity.c @@ -92,7 +92,8 @@ struct userdata { unsigned n_found; unsigned n_unknown; - pa_bool_t muted; + pa_bool_t muted:1; + pa_bool_t filter_added:1; }; static void update_volume(struct userdata *u) { @@ -358,9 +359,10 @@ static int add_matches(struct userdata *u, pa_bool_t add) { } else dbus_bus_remove_match(pa_dbus_connection_get(u->dbus_connection), filter2, &e); - if (add) + if (add) { pa_assert_se(dbus_connection_add_filter(pa_dbus_connection_get(u->dbus_connection), filter_func, u, NULL)); - else + u->filter_added = TRUE; + } else if (u->filter_added) dbus_connection_remove_filter(pa_dbus_connection_get(u->dbus_connection), filter_func, u); r = 0; @@ -393,9 +395,6 @@ int pa__init(pa_module*m) { u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); u->hci = pa_xstrdup(pa_modargs_get_value(ma, "hci", DEFAULT_HCI)); u->hci_path = pa_sprintf_malloc("/org/bluez/%s", u->hci); - u->n_found = u->n_unknown = 0; - u->muted = FALSE; - u->bondings = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); if (!(u->dbus_connection = pa_dbus_bus_get(m->core, DBUS_BUS_SYSTEM, &e))) { diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c index 103f5c4..875852f 100644 --- a/src/modules/module-console-kit.c +++ b/src/modules/module-console-kit.c @@ -67,6 +67,7 @@ struct userdata { pa_core *core; pa_dbus_connection *connection; pa_hashmap *sessions; + pa_bool_t filter_added; }; static void add_session(struct userdata *u, const char *id) { @@ -300,7 +301,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->connection = connection; @@ -311,6 +312,8 @@ int pa__init(pa_module*m) { goto fail; } + u->filter_added = TRUE; + if (pa_dbus_add_matches( pa_dbus_connection_get(connection), &error, "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'", @@ -359,7 +362,9 @@ void pa__done(pa_module *m) { "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionAdded'", "type='signal',sender='org.freedesktop.ConsoleKit',interface='org.freedesktop.ConsoleKit.Seat',member='SessionRemoved'", NULL); - dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + if (u->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + pa_dbus_connection_unref(u->connection); } diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index 1851913..23d4010 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -87,6 +87,7 @@ struct userdata { #ifdef HAVE_OSS_OUTPUT pa_bool_t init_subdevs; #endif + pa_bool_t filter_added:1; }; #define CAPABILITY_ALSA "alsa" @@ -733,12 +734,9 @@ 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->context = NULL; - u->connection = NULL; u->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); - u->capability = NULL; #ifdef HAVE_ALSA u->use_tsched = TRUE; @@ -800,6 +798,7 @@ int pa__init(pa_module*m) { pa_log_error("Failed to add filter function"); goto fail; } + u->filter_added = TRUE; if (pa_dbus_add_matches( pa_dbus_connection_get(u->connection), &error, @@ -856,7 +855,8 @@ void pa__done(pa_module *m) { "type='signal',sender='org.freedesktop.Hal',interface='org.freedesktop.Hal.Device.AccessControl',member='ACLRemoved'", "type='signal',interface='org.pulseaudio.Server',member='DirtyGiveUpMessage'", NULL); - dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); + if (u->filter_added) + dbus_connection_remove_filter(pa_dbus_connection_get(u->connection), filter_cb, u); pa_dbus_connection_unref(u->connection); } diff --git a/src/pulse/context.c b/src/pulse/context.c index 7468d0a..c83230d 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -145,7 +145,7 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char * pa_init_i18n(); - c = pa_xnew(pa_context, 1); + c = pa_xnew0(pa_context, 1); PA_REFCNT_INIT(c); c->proplist = p ? pa_proplist_copy(p) : pa_proplist_new(); @@ -157,9 +157,6 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char * c->system_bus = c->session_bus = NULL; #endif c->mainloop = mainloop; - c->client = NULL; - c->pstream = NULL; - c->pdispatch = NULL; c->playback_streams = pa_dynarray_new(); c->record_streams = pa_dynarray_new(); c->client_index = PA_INVALID_INDEX; @@ -170,22 +167,9 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char * c->error = PA_OK; c->state = PA_CONTEXT_UNCONNECTED; - c->ctag = 0; - c->csyncid = 0; reset_callbacks(c); - c->is_local = FALSE; - c->server_list = NULL; - c->server = NULL; - - c->do_shm = FALSE; - - c->server_specified = FALSE; - c->no_fail = FALSE; - c->do_autospawn = FALSE; - memset(&c->spawn_api, 0, sizeof(c->spawn_api)); - #ifndef MSG_NOSIGNAL #ifdef SIGPIPE pa_check_signal_is_blocked(SIGPIPE); @@ -255,12 +239,14 @@ static void context_free(pa_context *c) { #ifdef HAVE_DBUS if (c->system_bus) { - dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->system_bus), filter_cb, c); + if (c->filter_added) + dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->system_bus), filter_cb, c); pa_dbus_wrap_connection_free(c->system_bus); } if (c->session_bus) { - dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->session_bus), filter_cb, c); + if (c->filter_added) + dbus_connection_remove_filter(pa_dbus_wrap_connection_get(c->session_bus), filter_cb, c); pa_dbus_wrap_connection_free(c->session_bus); } #endif @@ -794,6 +780,7 @@ static void track_pulseaudio_on_dbus(pa_context *c, DBusBusType type, pa_dbus_wr pa_log_warn("Failed to add filter function"); goto fail; } + c->filter_added = TRUE; if (pa_dbus_add_matches( pa_dbus_wrap_connection_get(*conn), &error, diff --git a/src/pulse/internal.h b/src/pulse/internal.h index b371bfc..c3ebf74 100644 --- a/src/pulse/internal.h +++ b/src/pulse/internal.h @@ -91,6 +91,7 @@ struct pa_context { pa_bool_t no_fail:1; pa_bool_t do_autospawn:1; pa_bool_t use_rtclock:1; + pa_bool_t filter_added:1; pa_spawn_api spawn_api; pa_strlist *server_list; -- 1.6.0.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
