mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-31 19:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

hfp: use btstack_min [a2393]

Browse Source
This commit is contained in:
Milanka Ringwald 2019-11-19 14:42:01 +01:00
parent 09ca35c490
commit 6d9a4cd0ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/classic/hfp_hf.c
View File

@ -117,7 +117,7 @@ static void hfp_hf_emit_subscriber_information(btstack_packet_handler_t callback
event[2] = event_subtype; event[2] = event_subtype;
event[3] = status; event[3] = status;
event[4] = bnip_type; event[4] = bnip_type;
int size = (strlen(bnip_number) < (sizeof(event) - 6)) ? (int) strlen(bnip_number) : ((int) sizeof(event) - 6); uint16_t size = btstack_min(strlen(bnip_number), sizeof(event) - 6);
strncpy((char*)&event[5], bnip_number, size); strncpy((char*)&event[5], bnip_number, size);
event[5 + size] = 0; event[5 + size] = 0;
(*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event)); (*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
@ -130,7 +130,7 @@ static void hfp_hf_emit_type_and_number(btstack_packet_handler_t callback, uint8
event[1] = sizeof(event) - 2; event[1] = sizeof(event) - 2;
event[2] = event_subtype; event[2] = event_subtype;
event[3] = bnip_type; event[3] = bnip_type;
int size = (strlen(bnip_number) < (sizeof(event) - 5)) ? (int) strlen(bnip_number) : ((int) sizeof(event) - 5); uint16_t size = btstack_min(strlen(bnip_number), sizeof(event) - 5);
strncpy((char*)&event[4], bnip_number, size); strncpy((char*)&event[4], bnip_number, size);
event[4 + size] = 0; event[4 + size] = 0;
(*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event)); (*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
@ -151,7 +151,7 @@ static void hfp_hf_emit_enhanced_call_status(btstack_packet_handler_t callback,
event[pos++] = clcc_mode; event[pos++] = clcc_mode;
event[pos++] = clcc_mpty; event[pos++] = clcc_mpty;
event[pos++] = bnip_type; event[pos++] = bnip_type;
int size = (strlen(bnip_number) < (sizeof(event) - pos)) ? (int) strlen(bnip_number) : ((int) sizeof(event) - pos); uint16_t size = btstack_min(strlen(bnip_number), sizeof(event) - pos);
strncpy((char*)&event[pos], bnip_number, size); strncpy((char*)&event[pos], bnip_number, size);
pos += size; pos += size;
event[pos++] = 0; event[pos++] = 0;