diff options
| author | Martijn Coenen <maco@google.com> | 2016-05-13 07:34:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-13 07:34:10 +0000 |
| commit | c0e3e1e612e0ec448c28e3e4fd0e8e26b91e2876 (patch) | |
| tree | 492a248fa1c19dcb0a63056165eca8996ca9439c | |
| parent | cc6d4f138145d79f4314eb6488a065a6c0ff0fa9 (diff) | |
| parent | d8c0f58f6d44a5f6857552557e184871c3f43a97 (diff) | |
| download | libnfc-nci-c0e3e1e612e0ec448c28e3e4fd0e8e26b91e2876.tar.gz | |
Merge "Adding robustness to t3t callback function"android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3
| -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; |