korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-04 17:44:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

attrib: Fix gatt_primary leaks when a failure occurs

Browse Source
This commit is contained in:
Johan Hedberg 2014-03-20 11:00:30 +02:00
parent 8203def286
commit 62fa720891
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attrib/gatt.c
View File

@ -81,7 +81,7 @@ static void discover_primary_unref(void *data)
if (dp->ref > 0)
return;
g_slist_free(dp->primaries);
g_slist_free_full(dp->primaries, g_free);
g_attrib_unref(dp->attrib);
g_free(dp);
}

20
src/device.c
View File

@ -3327,7 +3327,7 @@ static void register_all_services(struct browse_req *req, GSList *services)
g_slist_free_full(device->primaries, g_free);
device->primaries = NULL;
device_register_primaries(device, g_slist_copy(services), -1);
device_register_primaries(device, services, -1);
device_probe_profiles(device, req->profiles_added);
@ -3406,6 +3406,7 @@ next:
search->current = search->current->next;
if (search->current == NULL) {
register_all_services(search->req, search->services);
search->services = NULL;
goto complete;
}
@ -3415,7 +3416,7 @@ next:
return;
complete:
g_slist_free(search->services);
g_slist_free_full(search->services, g_free);
g_free(search);
}
@ -3424,6 +3425,7 @@ static void find_included_services(struct browse_req *req, GSList *services)
struct btd_device *device = req->device;
struct included_search *search;
struct gatt_primary *prim;
GSList *l;
DBG("service count %u", g_slist_length(services));
@ -3435,7 +3437,19 @@ static void find_included_services(struct browse_req *req, GSList *services)
search = g_new0(struct included_search, 1);
search->req = req;
search->services = g_slist_copy(services);
/* We have to completely duplicate the data in order to have a
* clearly defined responsibility of freeing regardless of
* failure or success. Otherwise memory leaks are inevitable.
*/
for (l = services; l; l = g_slist_next(l)) {
struct gatt_primary *dup;
dup = g_memdup(l->data, sizeof(struct gatt_primary));
search->services = g_slist_append(search->services, dup);
}
search->current = search->services;
prim = search->current->data;