michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: TBS: Fix type of uri in bt_tbs_valid_uri

Browse source 
The function had marked the type as char *, but it was in fact
not a string but rather a uint8_t array.

Marked the type properly and added a cast when using it with
strings.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-08-20 13:19:03 +02:00 • committed by Fabio Baltieri
commit b250754f5b
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/audio/tbs.c
View file

@ -1741,7 +1741,7 @@ int bt_tbs_originate(uint8_t bearer_index, char *remote_uri,
if (tbs == NULL || inst_is_gtbs(tbs)) { if (tbs == NULL || inst_is_gtbs(tbs)) {
return -EINVAL; return -EINVAL;
} else if (!bt_tbs_valid_uri(remote_uri, strlen(remote_uri))) { } else if (!bt_tbs_valid_uri((uint8_t *)remote_uri, strlen(remote_uri))) {
LOG_DBG("Invalid URI %s", remote_uri); LOG_DBG("Invalid URI %s", remote_uri);
return -EINVAL; return -EINVAL;
} }
@ -1937,10 +1937,10 @@ int bt_tbs_remote_incoming(uint8_t bearer_index, const char *to,
if (inst == NULL || inst_is_gtbs(inst)) { if (inst == NULL || inst_is_gtbs(inst)) {
return -EINVAL; return -EINVAL;
} else if (!bt_tbs_valid_uri(to, strlen(to))) { } else if (!bt_tbs_valid_uri((uint8_t *)to, strlen(to))) {
LOG_DBG("Invalid \"to\" URI: %s", to); LOG_DBG("Invalid \"to\" URI: %s", to);
return -EINVAL; return -EINVAL;
} else if (!bt_tbs_valid_uri(from, strlen(from))) { } else if (!bt_tbs_valid_uri((uint8_t *)from, strlen(from))) {
LOG_DBG("Invalid \"from\" URI: %s", from); LOG_DBG("Invalid \"from\" URI: %s", from);
return -EINVAL; return -EINVAL;
} }

9
subsys/bluetooth/audio/tbs_internal.h
View file

@ -177,7 +177,7 @@ static inline const char *bt_tbs_term_reason_str(uint8_t reason)
} }
/** /**
* @brief Checks if a string contains a colon (':') followed by a printable * @brief Checks if @p uri contains a colon (':') followed by a printable
* character. Minimal uri is "a:b". * character. Minimal uri is "a:b".
* *
* @param uri The uri "scheme:id" * @param uri The uri "scheme:id"
@ -185,21 +185,20 @@ static inline const char *bt_tbs_term_reason_str(uint8_t reason)
* @return true If the above is true * @return true If the above is true
* @return false If the above is not true * @return false If the above is not true
*/ */
static inline bool bt_tbs_valid_uri(const char *uri, size_t len) static inline bool bt_tbs_valid_uri(const uint8_t *uri, size_t uri_len)
{ {
if (!uri) { if (!uri) {
return false; return false;
} }
if (len > CONFIG_BT_TBS_MAX_URI_LENGTH || if (uri_len > CONFIG_BT_TBS_MAX_URI_LENGTH || uri_len < BT_TBS_MIN_URI_LEN) {
len < BT_TBS_MIN_URI_LEN) {
return false; return false;
} else if (uri[0] < FIRST_PRINTABLE_ASCII_CHAR) { } else if (uri[0] < FIRST_PRINTABLE_ASCII_CHAR) {
/* Invalid first char */ /* Invalid first char */
return false; return false;
} }
for (int i = 1; i < len; i++) { for (size_t i = 1; i < uri_len; i++) {
if (uri[i] == ':' && uri[i + 1] >= FIRST_PRINTABLE_ASCII_CHAR) { if (uri[i] == ':' && uri[i + 1] >= FIRST_PRINTABLE_ASCII_CHAR) {
return true; return true;
} }