diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2017-07-18 19:01:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-18 19:01:05 +0000 |
| commit | ba12732aad257d8de8de748a97ecc0c6ffaa74e5 (patch) | |
| tree | 3a6addc455ae5d1a5cf530bc5831df4b6efe34bc | |
| parent | df16497d1cc6080788310e443b874d9a7db5695d (diff) | |
| parent | 7eda9961891b30da6380491bf5f2718184a8edb6 (diff) | |
| download | android_system_bt-ba12732aad257d8de8de748a97ecc0c6ffaa74e5.tar.gz android_system_bt-ba12732aad257d8de8de748a97ecc0c6ffaa74e5.tar.bz2 android_system_bt-ba12732aad257d8de8de748a97ecc0c6ffaa74e5.zip | |
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am: 8f18afd26c am: ffa87779a1
am: 7eda996189
Change-Id: I3587c48c072b808e8a84a63d1e6f63ea39f158b5
| -rw-r--r-- | stack/bnep/bnep_main.c | 2 | ||||
| -rw-r--r-- | stack/bnep/bnep_utils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/stack/bnep/bnep_main.c b/stack/bnep/bnep_main.c index f8267cd80..a20e1cf5e 100644 --- a/stack/bnep/bnep_main.c +++ b/stack/bnep/bnep_main.c @@ -565,6 +565,8 @@ static void bnep_data_ind (UINT16 l2cap_cid, BT_HDR *p_buf) p_bcb->con_state != BNEP_STATE_CONNECTED && extension_present && p && rem_len) { + if (p_bcb->p_pending_data) + GKI_freebuf (p_bcb->p_pending_data); p_bcb->p_pending_data = (BT_HDR *)GKI_getbuf (rem_len + sizeof(BT_HDR)); if (p_bcb->p_pending_data) { diff --git a/stack/bnep/bnep_utils.c b/stack/bnep/bnep_utils.c index 356c29f9a..611cb12ed 100644 --- a/stack/bnep/bnep_utils.c +++ b/stack/bnep/bnep_utils.c @@ -150,6 +150,8 @@ void bnepu_release_bcb (tBNEP_CONN *p_bcb) /* Drop any response pointer we may be holding */ p_bcb->con_state = BNEP_STATE_IDLE; + if (p_bcb->p_pending_data) + GKI_freebuf (p_bcb->p_pending_data); p_bcb->p_pending_data = NULL; /* Free transmit queue */ |