mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-31 00:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

goep_client: send empty name without trailing \0

Browse Source
This commit is contained in:
Matthias Ringwald 2018-10-13 13:29:46 +02:00
parent fc8c9c93cb
commit 5715f07244
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/classic/goep_client.c
View File

@ -521,15 +521,19 @@ void goep_client_add_header_challenge_response(uint16_t goep_cid, uint16_t lengt
void goep_client_add_header_name(uint16_t goep_cid, const char * name){ void goep_client_add_header_name(uint16_t goep_cid, const char * name){
UNUSED(goep_cid); UNUSED(goep_cid);
goep_client_t * context = goep_client; goep_client_t * context = goep_client;
int len_incl_zero = strlen(name) + 1; int len = strlen(name);
if (len) {
// empty string does not have trailing \0
len++;
}
uint8_t * buffer = goep_client_get_outgoing_buffer(context); uint8_t * buffer = goep_client_get_outgoing_buffer(context);
uint16_t pos = big_endian_read_16(buffer, 1); uint16_t pos = big_endian_read_16(buffer, 1);
buffer[pos++] = OBEX_HEADER_NAME; buffer[pos++] = OBEX_HEADER_NAME;
big_endian_store_16(buffer, pos, 1 + 2 + len_incl_zero*2); big_endian_store_16(buffer, pos, 1 + 2 + len*2);
pos += 2; pos += 2;
int i; int i;
// @note name[len] == 0 // @note name[len] == 0
for (i = 0 ; i < len_incl_zero ; i++){ for (i = 0 ; i < len ; i++){
buffer[pos++] = 0; buffer[pos++] = 0;
buffer[pos++] = *name++; buffer[pos++] = *name++;
} }