diff options
Diffstat (limited to 'halimpl/hal')
| -rwxr-xr-x | halimpl/hal/phNxpNciHal_ext.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/halimpl/hal/phNxpNciHal_ext.cc b/halimpl/hal/phNxpNciHal_ext.cc index 1bbd25f..f9b92f8 100755 --- a/halimpl/hal/phNxpNciHal_ext.cc +++ b/halimpl/hal/phNxpNciHal_ext.cc @@ -664,7 +664,8 @@ NFCSTATUS phNxpNciHal_write_ext(uint16_t* cmd_len, uint8_t* p_cmd_data, } } - if (retval == 0x01 && p_cmd_data[0] == 0x21 && p_cmd_data[1] == 0x00) { + if (*cmd_len <= (NCI_MAX_DATA_LEN - 3) && + retval == 0x01 && p_cmd_data[0] == 0x21 && p_cmd_data[1] == 0x00) { NXPLOG_NCIHAL_D("Going through extns - Adding Mifare in RF Discovery"); p_cmd_data[2] += 3; p_cmd_data[3] += 1; @@ -774,7 +775,8 @@ NFCSTATUS phNxpNciHal_write_ext(uint16_t* cmd_len, uint8_t* p_cmd_data, phNxpNciHal_print_packet("RECV", p_rsp_data, 5); // status = NFCSTATUS_FAILED; NXPLOG_NCIHAL_D("> Going through workaround - Dirty Set Config - End "); - } else if (p_cmd_data[0] == 0x21 && p_cmd_data[1] == 0x00) { + } else if (*cmd_len <= (NCI_MAX_DATA_LEN - 3) && + p_cmd_data[0] == 0x21 && p_cmd_data[1] == 0x00) { NXPLOG_NCIHAL_D( "> Going through workaround - Add Mifare Classic in Discovery Map"); p_cmd_data[*cmd_len] = 0x80; |