diff options
| author | Matthew Xie <mattx@google.com> | 2014-09-07 16:08:59 -0700 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2014-09-08 17:10:21 +0000 |
| commit | c8eddb5ae46da76552d3cd3d9fff8d33c1880a52 (patch) | |
| tree | 9f812c2c66de7ca614af9e28de15f7e318ea564b /stack/srvc | |
| parent | 9c29d08bc7c6da33db5cfc777404354c6dca845c (diff) | |
| download | android_system_bt-c8eddb5ae46da76552d3cd3d9fff8d33c1880a52.tar.gz android_system_bt-c8eddb5ae46da76552d3cd3d9fff8d33c1880a52.tar.bz2 android_system_bt-c8eddb5ae46da76552d3cd3d9fff8d33c1880a52.zip | |
Make sure conn_id is valid before using it
Bug: 17401266
Change-Id: I5f36e13b3ccb327f191db33123fff98858f07c5f
Diffstat (limited to 'stack/srvc')
| -rw-r--r-- | stack/srvc/srvc_eng.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/stack/srvc/srvc_eng.c b/stack/srvc/srvc_eng.c index f0d6dfbfb..39299c5fd 100644 --- a/stack/srvc/srvc_eng.c +++ b/stack/srvc/srvc_eng.c @@ -411,11 +411,16 @@ void srvc_eng_release_channel (UINT16 conn_id) { tSRVC_CLCB *p_clcb = srvc_eng_find_clcb_by_conn_id(conn_id); + if (p_clcb == NULL) + { + GATT_TRACE_ERROR("%s: invalid connection id %d", __FUNCTION__, conn_id); + return; + } + p_clcb->cur_srvc_id = SRVC_ID_NONE; /* check pending request */ - //if (p_clcb->pend_req == NULL) - GATT_Disconnect(p_clcb->conn_id); + GATT_Disconnect(p_clcb->conn_id); } /******************************************************************************* ** |