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

rfcomm: fix infinite loop on l2cap connection establishmend error

Browse Source
This commit is contained in:
Matthias Ringwald 2018-03-12 12:32:22 +01:00
parent 292a51b3ab
commit 6b896dfc53
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/classic/rfcomm.c
View File

@ -988,12 +988,15 @@ static int rfcomm_hci_event_handler(uint8_t *packet, uint16_t size){
multiplexer->state = RFCOMM_MULTIPLEXER_SHUTTING_DOWN; multiplexer->state = RFCOMM_MULTIPLEXER_SHUTTING_DOWN;
// emit rfcomm_channel_opened with status and free channel // emit rfcomm_channel_opened with status and free channel
int done = 0; // note: repeatedly go over list until full iteration causes no further change
while (!done){ int done;
do {
done = 1;
btstack_linked_item_t * it = (btstack_linked_item_t *) &rfcomm_channels; btstack_linked_item_t * it = (btstack_linked_item_t *) &rfcomm_channels;
while (it->next) { while (it->next) {
rfcomm_channel_t * channel = (rfcomm_channel_t *) it->next; rfcomm_channel_t * channel = (rfcomm_channel_t *) it->next;
if (channel->multiplexer == multiplexer){ if (channel->multiplexer == multiplexer){
done = 0;
rfcomm_emit_channel_opened(channel, status); rfcomm_emit_channel_opened(channel, status);
btstack_linked_list_remove(&rfcomm_channels, (btstack_linked_item_t *) channel); btstack_linked_list_remove(&rfcomm_channels, (btstack_linked_item_t *) channel);
btstack_memory_rfcomm_channel_free(channel); btstack_memory_rfcomm_channel_free(channel);
@ -1002,7 +1005,7 @@ static int rfcomm_hci_event_handler(uint8_t *packet, uint16_t size){
it = it->next; it = it->next;
} }
} }
} } while (!done);
// free multiplexer // free multiplexer
rfcomm_multiplexer_free(multiplexer); rfcomm_multiplexer_free(multiplexer);