summaryrefslogtreecommitdiffstatshomepage
path: root/ports/stm32/rfcore.c
diff options
context:
space:
mode:
authorJim Mussared <jim.mussared@gmail.com>2020-08-31 15:55:09 +1000
committerDamien George <damien@micropython.org>2020-09-08 23:53:12 +1000
commit01f2d776141d94b8d15d91aa1e0f0cef4244d5f7 (patch)
tree932f507aef6f81da676ff74d10e15918aa26d5a2 /ports/stm32/rfcore.c
parent5eda362e0a7ed0eda6a4becdebf76a53cf69f944 (diff)
downloadmicropython-01f2d776141d94b8d15d91aa1e0f0cef4244d5f7.tar.gz
micropython-01f2d776141d94b8d15d91aa1e0f0cef4244d5f7.zip
stm32/rfcore: Fix length matching in HCI parser.
Diffstat (limited to 'ports/stm32/rfcore.c')
-rw-r--r--ports/stm32/rfcore.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 3565c03898..99bb405630 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -258,11 +258,13 @@ STATIC int ipcc_wait_msg(unsigned int ch, uint32_t timeout_ms) {
STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
const char *kind;
- size_t len = 3 + buf[2];
+ size_t len = 0;
switch (buf[0]) {
case 0x02: {
// Standard BT HCI ACL packet
kind = "HCI_ACL";
+ // <kind><?><?><len LSB><len MSB>
+ len = 5 + buf[3] + (buf[4] << 8);
if (parse != NULL) {
parse->cb_fun(parse->cb_env, buf, len);
}
@@ -271,6 +273,8 @@ STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
case 0x04: {
// Standard BT HCI event packet
kind = "HCI_EVT";
+ // <kind><op><len><data...>
+ len = 3 + buf[2];
if (parse != NULL) {
bool fix = false;
if (buf[1] == 0x0e && len == 7 && buf[3] == 0x01 && buf[4] == 0x63 && buf[5] == 0x0c && buf[6] == 0x01) {