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

bluetooth: Don't free modargs twice

Browse source 
CID1353139

Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald-Stadler 2016-08-16 07:16:31 +02:00
parent 8b076c3ed9
commit 4231befa77
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/bluetooth/module-bluez5-device.c
View file

@ -2162,24 +2162,24 @@ int pa__init(pa_module* m) {
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log_error("Failed to parse module arguments"); pa_log_error("Failed to parse module arguments");
goto fail; goto fail_free_modargs;
} }
if (!(path = pa_modargs_get_value(ma, "path", NULL))) { if (!(path = pa_modargs_get_value(ma, "path", NULL))) {
pa_log_error("Failed to get device path from module arguments"); pa_log_error("Failed to get device path from module arguments");
goto fail; goto fail_free_modargs;
} }
if ((u->discovery = pa_shared_get(u->core, "bluetooth-discovery"))) if ((u->discovery = pa_shared_get(u->core, "bluetooth-discovery")))
pa_bluetooth_discovery_ref(u->discovery); pa_bluetooth_discovery_ref(u->discovery);
else { else {
pa_log_error("module-bluez5-discover doesn't seem to be loaded, refusing to load module-bluez5-device"); pa_log_error("module-bluez5-discover doesn't seem to be loaded, refusing to load module-bluez5-device");
goto fail; goto fail_free_modargs;
} }
if (!(u->device = pa_bluetooth_discovery_get_device_by_path(u->discovery, path))) { if (!(u->device = pa_bluetooth_discovery_get_device_by_path(u->discovery, path))) {
pa_log_error("%s is unknown", path); pa_log_error("%s is unknown", path);
goto fail; goto fail_free_modargs;
} }
pa_modargs_free(ma); pa_modargs_free(ma);
@ -2198,7 +2198,6 @@ int pa__init(pa_module* m) {
u->transport_microphone_gain_changed_slot = u->transport_microphone_gain_changed_slot =
pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_microphone_gain_changed_cb, u); pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery, PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_microphone_gain_changed_cb, u);
if (add_card(u) < 0) if (add_card(u) < 0)
goto fail; goto fail;
@ -2225,11 +2224,13 @@ off:
return 0; return 0;
fail: fail_free_modargs:
if (ma) if (ma)
pa_modargs_free(ma); pa_modargs_free(ma);
fail:
pa__done(m); pa__done(m);
return -1; return -1;