mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-18 19:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbap_client: used actual (utf-8) char len

Browse Source
This commit is contained in:
Matthias Ringwald 2021-02-25 16:49:31 +01:00
parent d1769b9f48
commit 45f043bab0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/classic/pbap_client.c
View File

@ -582,6 +582,7 @@ static void pbap_client_process_vcard_listing(uint8_t *packet, uint16_t size){
int handle_found = 0;
char name[PBAP_MAX_NAME_LEN];
char handle[PBAP_MAX_HANDLE_LEN];
uint16_t char_len;
while (data_len--){
yxml_ret_t r = yxml_parse(&pbap_client->xml_parser, *data++);
switch (r){
@ -610,13 +611,15 @@ static void pbap_client_process_vcard_listing(uint8_t *packet, uint16_t size){
case YXML_ATTRVAL:
if (name_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
if ((strlen(name) + 4 + 1) >= sizeof(name)) break;
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(name) + char_len + 1) >= sizeof(name)) break;
strcat(name, pbap_client->xml_parser.data);
break;
}
if (handle_found) {
// "In UTF-8, characters from the U+0000..U+10FFFF range (the UTF-16 accessible range) are encoded using sequences of 1 to 4 octets."
if ((strlen(handle) + 4 + 1) >= sizeof(handle)) break;
char_len = strlen(pbap_client->xml_parser.data);
if ((strlen(handle) + char_len + 1) >= sizeof(handle)) break;
strcat(handle, pbap_client->xml_parser.data);
break;
}