espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-14 22:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nimble/l2cap: Fix possible memory leak"

Browse Source 
This reverts commit cf63688ebf.

This is not needed as ble_l2cap_prepend_hdr() will free txom when
returning NULL
This commit is contained in:
Łukasz Rymanowski
2019-03-26 07:53:25 +01:00
parent 286ae23d4e
commit 370305a086
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_l2cap.c
+4 -6
View File
@@ -393,15 +393,13 @@ ble_l2cap_tx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
struct os_mbuf *txom)
{
int rc;
struct os_mbuf *om;
om = ble_l2cap_prepend_hdr(txom, chan->dcid, OS_MBUF_PKTLEN(txom));
if (om == NULL) {
os_mbuf_free_chain(txom);
txom = ble_l2cap_prepend_hdr(txom, chan->dcid, OS_MBUF_PKTLEN(txom));
if (txom == NULL) {
return BLE_HS_ENOMEM;
}
rc = ble_hs_hci_acl_tx(conn, &om);
rc = ble_hs_hci_acl_tx(conn, &txom);
switch (rc) {
case 0:
/* Success. */
@@ -409,7 +407,7 @@ ble_l2cap_tx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
case BLE_HS_EAGAIN:
/* Controller could not accommodate full packet. Enqueue remainder. */
STAILQ_INSERT_TAIL(&conn->bhc_tx_q, OS_MBUF_PKTHDR(om), omp_next);
STAILQ_INSERT_TAIL(&conn->bhc_tx_q, OS_MBUF_PKTHDR(txom), omp_next);
return 0;
default: