patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Bluetooth: Services: Ensure correct ID before getting object index

Browse source 
Moved the call to obj_id_to_index such that we can check for valid
ID before getting the index.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-03-02 12:50:30 +01:00 committed by Carles Cufí
parent 806344c8e0
commit 0cc408a9ac
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/services/ots/ots_obj_manager.c
View file

@ -155,7 +155,7 @@ int bt_gatt_ots_obj_manager_obj_get(
struct bt_gatt_ots_obj_manager *obj_manager, uint64_t id,
struct bt_gatt_ots_object **object)
{
uint64_t i = obj_id_to_index(id);
uint64_t index;
if (sys_dlist_is_empty(&obj_manager->list)) {
return -ENOENT;
@ -167,15 +167,17 @@ int bt_gatt_ots_obj_manager_obj_get(
return -EINVAL;
}
if (i >= ARRAY_SIZE(obj_manager->pool)) {
index = obj_id_to_index(id);
if (index >= ARRAY_SIZE(obj_manager->pool)) {
return -EINVAL;
}
if (!obj_manager->pool[i].is_allocated) {
if (!obj_manager->pool[index].is_allocated) {
return -EINVAL;
}
*object = &obj_manager->pool[i].val;
*object = &obj_manager->pool[index].val;
return 0;
}