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

properly free modargs object when init fails; don't abbreviate modargs in struct

Browse source
This commit is contained in:
Lennart Poettering 2009-02-12 04:00:40 +01:00
parent a371306710
commit 84666dbc88
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/bluetooth/module-bluetooth-discover.c
View file

@ -55,7 +55,7 @@ static const char* const valid_modargs[] = {
struct userdata { struct userdata {
pa_module *module; pa_module *module;
pa_modargs *ma; pa_modargs *modargs;
pa_core *core; pa_core *core;
pa_dbus_connection *connection; pa_dbus_connection *connection;
pa_bluetooth_discovery *discovery; pa_bluetooth_discovery *discovery;
@ -77,11 +77,13 @@ static void load_module_for_device(struct userdata *u, pa_bluetooth_device *d, p
args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path); args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path);
if (pa_modargs_get_value(u->ma, "sco_sink", NULL) && if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) &&
pa_modargs_get_value(u->ma, "sco_source", NULL)) { pa_modargs_get_value(u->modargs, "sco_source", NULL)) {
char *tmp; char *tmp;
tmp = pa_sprintf_malloc("%s sco_sink=\"%s\" sco_source=\"%s\"", args, pa_modargs_get_value(u->ma, "sco_sink", NULL), pa_modargs_get_value(u->ma, "sco_source", NULL)); tmp = pa_sprintf_malloc("%s sco_sink=\"%s\" sco_source=\"%s\"", args,
pa_modargs_get_value(u->modargs, "sco_sink", NULL),
pa_modargs_get_value(u->modargs, "sco_source", NULL));
pa_xfree(args); pa_xfree(args);
args = tmp; args = tmp;
} }
@ -127,7 +129,7 @@ static int setup_dbus(struct userdata *u) {
int pa__init(pa_module* m) { int pa__init(pa_module* m) {
struct userdata *u; struct userdata *u;
pa_modargs *ma; pa_modargs *ma = NULL;
pa_bool_t async = FALSE; pa_bool_t async = FALSE;
pa_assert(m); pa_assert(m);
@ -145,7 +147,8 @@ int pa__init(pa_module* m) {
m->userdata = u = pa_xnew0(struct userdata, 1); m->userdata = u = pa_xnew0(struct userdata, 1);
u->module = m; u->module = m;
u->core = m->core; u->core = m->core;
u->ma = ma; u->modargs = ma;
ma = NULL;
if (setup_dbus(u) < 0) if (setup_dbus(u) < 0)
goto fail; goto fail;
@ -161,6 +164,9 @@ int pa__init(pa_module* m) {
fail: fail:
pa__done(m); pa__done(m);
if (ma)
pa_modargs_free(ma);
return -1; return -1;
} }
@ -178,8 +184,8 @@ void pa__done(pa_module* m) {
if (u->connection) if (u->connection)
pa_dbus_connection_unref(u->connection); pa_dbus_connection_unref(u->connection);
if (u->ma) if (u->modargs)
pa_modargs_free(u->ma); pa_modargs_free(u->modargs);
pa_xfree(u); pa_xfree(u);
} }