mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: Don't crash if the module does not load

Browse source 
If module-dbus-protocol fails to start, pa__done is still called,
which falsified the assumption that u->connections was always set.

BugLink: http://bugs.launchpad.net/bugs/855729
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2011-09-22 13:57:56 +02:00 • committed by Arun Raghavan
parent cae3235369
commit 165bd13d9e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/dbus/module-dbus-protocol.c
View file

@ -594,10 +594,12 @@ void pa__done(pa_module *m) {
if (u->core_iface) if (u->core_iface)
pa_dbusiface_core_free(u->core_iface); pa_dbusiface_core_free(u->core_iface);
while ((c = pa_idxset_steal_first(u->connections, NULL))) if (u->connections) {
connection_free(c); while ((c = pa_idxset_steal_first(u->connections, NULL)))
connection_free(c);
pa_idxset_free(u->connections, NULL, NULL); pa_idxset_free(u->connections, NULL, NULL);
}
/* This must not be called before the connections are freed, because if /* This must not be called before the connections are freed, because if
* there are any connections left, they will emit the * there are any connections left, they will emit the