components/bt: Fix memory leak about rfcomm

diff --git a/components/bt/bluedroid/main/bte_init.c b/components/bt/bluedroid/main/bte_init.c
index 38cfc812fbc1610c4f5abba331b71b4bd5e02b4f..5477e9dd87ef1609d21ab95c4e04a6671b7c55e2 100644 (file)
--- a/components/bt/bluedroid/main/bte_init.c
+++ b/components/bt/bluedroid/main/bte_init.c
@@ -366,4 +366,9 @@ void BTE_DeinitStack(void)
 #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE)
     A2D_Deinit();
 #endif
+
+#if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE)
+    RFCOMM_Deinit();
+#endif
+
 }

diff --git a/components/bt/bluedroid/stack/include/stack/port_api.h b/components/bt/bluedroid/stack/include/stack/port_api.h
index 10b0378681796e87129da3c79389f6855e37320d..8145a177a0f79b2d53064e2414aa9be1428cd38c 100644 (file)
--- a/components/bt/bluedroid/stack/include/stack/port_api.h
+++ b/components/bt/bluedroid/stack/include/stack/port_api.h
@@ -623,6 +623,17 @@ extern int PORT_Test (UINT16 handle, UINT8 *p_data, UINT16 len);
 *******************************************************************************/
 extern void RFCOMM_Init (void);
 
+/*******************************************************************************
+**
+** Function         RFCOMM_Deinit
+**
+** Description      This function is called to deinitialize the control block
+**                  for this layer.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void RFCOMM_Deinit(void);
 
 /*******************************************************************************
 **

diff --git a/components/bt/bluedroid/stack/rfcomm/port_api.c b/components/bt/bluedroid/stack/rfcomm/port_api.c
index fd8246c53dd5204821488cd657c5428811d10b91..7407694dadef2768f9d028c317d939b76eeb0045 100644 (file)
--- a/components/bt/bluedroid/stack/rfcomm/port_api.c
+++ b/components/bt/bluedroid/stack/rfcomm/port_api.c
@@ -1729,6 +1729,26 @@ void RFCOMM_Init (void)
     rfcomm_l2cap_if_init ();
 }
 
+/*******************************************************************************
+**
+** Function         RFCOMM_Deinit
+**
+** Description      This function is called to deinitialize the control block
+**                  for this layer.
+**
+** Returns          void
+**
+*******************************************************************************/
+void RFCOMM_Deinit(void)
+{
+#if RFC_DYNAMIC_MEMORY == TRUE
+    if (rfc_cb_ptr){
+        osi_free(rfc_cb_ptr);
+        rfc_cb_ptr = NULL;
+    }
+#endif
+}
+
 /*******************************************************************************
 **
 ** Function         PORT_SetTraceLevel