diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-06 18:23:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-06 18:23:29 +0000 |
| commit | 9d803cdb037118044011e200e065999199e4aafc (patch) | |
| tree | 038ab28cca81313acf8764bf629ba1ad7e687dcb | |
| parent | c99d11b183159f3f72f3c1a1b241ce3983a292dd (diff) | |
| parent | cba7232db14f6ffceb6813315177ee99c422e343 (diff) | |
| download | libnfc-nci-master.tar.gz | |
Merge "Fix native crash in nfc_ncif_proc_activate"HEADandroid-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4nougat-iot-releasen-iot-preview-4mastermain
| -rw-r--r-- | src/nfc/nfc/nfc_ncif.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c index 06c12bb..2329933 100644 --- a/src/nfc/nfc/nfc_ncif.c +++ b/src/nfc/nfc/nfc_ncif.c @@ -839,6 +839,8 @@ void nfc_ncif_proc_activate (UINT8 *p, UINT8 len) pp++; /* TC */ } p_pa_iso->his_byte_len = (UINT8) (p_pa_iso->ats_res_len - (pp - p_pa_iso->ats_res)); + if (p_pa_iso->his_byte_len > NFC_MAX_HIS_BYTES_LEN) + p_pa_iso->his_byte_len = NFC_MAX_HIS_BYTES_LEN; memcpy (p_pa_iso->his_byte, pp, p_pa_iso->his_byte_len); break; |