From 796a959fa50a74fa99588da2d0111b37b973a76a Mon Sep 17 00:00:00 2001
From: zwj <zhiweijian@espressif.com>
Date: Thu, 17 Sep 2020 14:32:27 +0800
Subject: [PATCH] fix vendor hci memory leak

---
 components/bt/host/bluedroid/bta/dm/bta_dm_api.c     |  4 +---
 .../bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c  | 12 ++++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_api.c b/components/bt/host/bluedroid/bta/dm/bta_dm_api.c
index fff6c053cb..acf93b585d 100644
--- a/components/bt/host/bluedroid/bta/dm/bta_dm_api.c
+++ b/components/bt/host/bluedroid/bta/dm/bta_dm_api.c
@@ -2676,9 +2676,7 @@ void BTA_VendorCleanup (void)
     }
 #endif
 
-    if (cmn_ble_vsc_cb.adv_inst_max > 0) {
-        btm_ble_multi_adv_cleanup();
-    }
+    btm_ble_multi_adv_cleanup();
 }
 #if (BLE_50_FEATURE_SUPPORT == TRUE)
 void BTA_DmBleGapReadPHY(BD_ADDR addr)
diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c b/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c
index a616a541df..443dd64edf 100644
--- a/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c
+++ b/components/bt/host/bluedroid/stack/btm/btm_ble_multi_adv.c
@@ -840,10 +840,14 @@ void btm_ble_multi_adv_cleanup(void)
     }
 
 #if BTM_DYNAMIC_MEMORY == TRUE
-    osi_free(btm_multi_adv_cb_ptr);
-    osi_free(btm_multi_adv_idx_q_ptr);
-    btm_multi_adv_cb_ptr = NULL;
-    btm_multi_adv_idx_q_ptr = NULL;
+    if(btm_multi_adv_cb_ptr) {
+       osi_free(btm_multi_adv_cb_ptr);
+       btm_multi_adv_cb_ptr = NULL;
+    }
+    if(btm_multi_adv_idx_q_ptr) {
+       osi_free(btm_multi_adv_idx_q_ptr);
+       btm_multi_adv_idx_q_ptr = NULL;
+    }
 #endif
 }