michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Samples: Bluetooth: TMAP peripheral avoid using strtok

Browse source 
strtok should not be used for the purpose it was being used for.
Furthermore, the pointer that was stored from the value is not
a long-living pointer, and would in fact be invalid after the
callback has returned.

Modified the code so that we store the value in the application
and then do a proper search for the first URI in the list.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2023-05-25 12:25:58 +02:00 • committed by Carles Cufí
commit 534d6f3b2c
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
samples/bluetooth/tmap_peripheral/src/ccp_call_ctrl.c
View file

@ -20,7 +20,7 @@
#define CALLER_ID "friend"
static uint8_t new_call_index;
static char *remote_uri;
static char remote_uri[CONFIG_BT_TBS_MAX_URI_LENGTH];
static K_SEM_DEFINE(sem_discovery_done, 0, 1);
@ -77,7 +77,7 @@ static void terminate_call_cb(struct bt_conn *conn, int err,
static void read_uri_schemes_string_cb(struct bt_conn *conn, int err,
uint8_t inst_index, const char *value)
{
char *str_aux;
size_t i;
if (inst_index != BT_TBS_GTBS_INDEX) {
printk("Unexpected %s for instance %u\n", __func__, inst_index);
@ -89,9 +89,25 @@ static void read_uri_schemes_string_cb(struct bt_conn *conn, int err,
return;
}
/* Save first remote URI */
str_aux = (char *)value;
remote_uri = strtok(str_aux, ",");
/* Save first remote URI
*
* First search for the first comma (separator), and use that to determine the end of the
* first (or only) URI. Then use that length to copy the URI to `remote_uri` for later use.
*/
for (i = 0U; i < strlen(value); i++) {
if (value[i] == ',') {
break;
}
}
if (i > sizeof(remote_uri)) {
printk("Cannot store URI of length %zu: %s\n", i, value);
return;
}
strncpy(remote_uri, value, i);
remote_uri[i] = '\0';
printk("CCP: Discovered remote URI: %s\n", remote_uri);
k_sem_give(&sem_discovery_done);
}