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

fix bad memory access when destroying m-b-d

Browse source
This commit is contained in:
Lennart Poettering 2009-03-24 21:42:33 +01:00
parent c64d8cbcc7
commit 5b523d097c
1 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,23 +69,24 @@ struct userdata {
pa_hashmap *hashmap; pa_hashmap *hashmap;
}; };
struct module_info {
char *path;
uint32_t module;
};
static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const pa_bluetooth_device *d, struct userdata *u) { static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const pa_bluetooth_device *d, struct userdata *u) {
uint32_t midx; struct module_info *mi;
pa_assert(u); pa_assert(u);
pa_assert(d); pa_assert(d);
mi = pa_hashmap_get(u->hashmap, d->path);
if (!(midx = PA_PTR_TO_UINT(pa_hashmap_get(u->hashmap, d->path))))
midx = PA_INVALID_INDEX;
else
midx--;
if (!d->dead && if (!d->dead &&
d->device_connected > 0 && d->device_connected > 0 &&
(d->audio_sink_connected > 0 || d->headset_connected > 0)) { (d->audio_sink_connected > 0 || d->headset_connected > 0)) {
if (midx == PA_INVALID_INDEX) { if (!mi) {
pa_module *m = NULL; pa_module *m = NULL;
char *args; char *args;
@ -110,22 +111,28 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
m = pa_module_load(u->module->core, "module-bluetooth-device", args); m = pa_module_load(u->module->core, "module-bluetooth-device", args);
pa_xfree(args); pa_xfree(args);
if (m) if (m) {
pa_hashmap_put(u->hashmap, d->path, PA_UINT_TO_PTR((uint32_t) (m->index+1))); mi = pa_xnew(struct module_info, 1);
else mi->module = m->index;
mi->path = pa_xstrdup(d->path);
pa_hashmap_put(u->hashmap, mi->path, mi);
} else
pa_log_debug("Failed to load module for device %s", d->path); pa_log_debug("Failed to load module for device %s", d->path);
} }
} else { } else {
if (midx != PA_INVALID_INDEX) { if (mi) {
/* Hmm, disconnection? Then let's unload our module */ /* Hmm, disconnection? Then let's unload our module */
pa_log_debug("Unloading module for %s", d->path); pa_log_debug("Unloading module for %s", d->path);
pa_module_unload_request_by_index(u->core, midx, TRUE); pa_module_unload_request_by_index(u->core, mi->module, TRUE);
pa_hashmap_remove(u->hashmap, d->path); pa_hashmap_remove(u->hashmap, mi->path);
pa_xfree(mi->path);
pa_xfree(mi);
} }
} }
@ -189,8 +196,16 @@ void pa__done(pa_module* m) {
if (u->discovery) if (u->discovery)
pa_bluetooth_discovery_unref(u->discovery); pa_bluetooth_discovery_unref(u->discovery);
if (u->hashmap) if (u->hashmap) {
struct module_info *mi;
while ((mi = pa_hashmap_steal_first(u->hashmap))) {
pa_xfree(mi->path);
pa_xfree(mi);
}
pa_hashmap_free(u->hashmap, NULL, NULL); pa_hashmap_free(u->hashmap, NULL, NULL);
}
if (u->modargs) if (u->modargs)
pa_modargs_free(u->modargs); pa_modargs_free(u->modargs);