diff options
| author | Martijn Coenen <maco@google.com> | 2014-09-26 19:14:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-26 19:14:10 +0000 |
| commit | ed2d14c15500d990e9d61e7d22042608fa80c5c7 (patch) | |
| tree | 38e4ba00d3d2a03a928f1162345294e1a7575a3f | |
| parent | 8df564e55201ea56bea9da4587c0d25f5ecf90ba (diff) | |
| parent | c19fe79a280fb5451b9f7506222c8676dd91d12b (diff) | |
| download | libnfc-nci-lollipop-mr1-wfc-release.tar.gz | |
Merge "Fix null pointer dereference." into lmp-devandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devlollipop-dev
| -rw-r--r-- | src/nfa/ce/nfa_ce_act.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nfa/ce/nfa_ce_act.c b/src/nfa/ce/nfa_ce_act.c index ba09125..2e8ca56 100644 --- a/src/nfa/ce/nfa_ce_act.c +++ b/src/nfa/ce/nfa_ce_act.c @@ -947,7 +947,8 @@ BOOLEAN nfa_ce_deactivate_ntf (tNFA_CE_MSG *p_ce_msg) { conn_evt.ce_deactivated.handle = NFA_HANDLE_GROUP_CE | ((tNFA_HANDLE)nfa_ce_cb.idx_wild_card); conn_evt.ce_deactivated.type = deact_type; - (*p_cb->p_active_conn_cback) (NFA_CE_DEACTIVATED_EVT, &conn_evt); + if (p_cb->p_active_conn_cback) + (*p_cb->p_active_conn_cback) (NFA_CE_DEACTIVATED_EVT, &conn_evt); } return TRUE; |