diff options
| author | Martijn Coenen <maco@google.com> | 2016-05-13 07:44:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-13 07:44:42 +0000 |
| commit | a1a16d4c147ecd487694899e9657a65e0c51878a (patch) | |
| tree | 492a248fa1c19dcb0a63056165eca8996ca9439c | |
| parent | 9c9f42f5531202b6d168d94fea4844f87a818992 (diff) | |
| parent | 34167af9fca6c9669de5ea8a2301d1df63729ec2 (diff) | |
| download | libnfc-nci-a1a16d4c147ecd487694899e9657a65e0c51878a.tar.gz | |
Merge "Adding robustness to t3t callback function" am: c0e3e1e612
am: 34167af9fc
* commit '34167af9fca6c9669de5ea8a2301d1df63729ec2':
Adding robustness to t3t callback function
Change-Id: Id311151df14cbe2d2cd379d9b215c996f2dd6ff3
| -rw-r--r-- | src/nfc/tags/rw_t3t.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nfc/tags/rw_t3t.c b/src/nfc/tags/rw_t3t.c index f8ec361..5c60422 100644 --- a/src/nfc/tags/rw_t3t.c +++ b/src/nfc/tags/rw_t3t.c @@ -2363,8 +2363,9 @@ void rw_t3t_conn_cback (UINT8 conn_id, tNFC_CONN_EVT event, tNFC_CONN *p_data) break; case NFC_DATA_CEVT: /* check for status in tNFC_CONN */ - if ( (p_data->data.status == NFC_STATUS_OK) - ||(p_data->data.status == NFC_STATUS_CONTINUE) ) + if ( (p_data != NULL) + &&( (p_data->data.status == NFC_STATUS_OK) + ||(p_data->data.status == NFC_STATUS_CONTINUE) ) ) { rw_t3t_data_cback (conn_id, &(p_data->data)); break; @@ -2387,7 +2388,7 @@ void rw_t3t_conn_cback (UINT8 conn_id, tNFC_CONN_EVT event, tNFC_CONN *p_data) if (event == NFC_ERROR_CEVT) rw_t3t_process_error (NFC_STATUS_TIMEOUT); - else + else if (p_data) rw_t3t_process_error (p_data->status); break; |