Merge 7639d1a227 into d4cd437ede

components/bt/common/btc/core/btc_task.c

@@ -286,6 +286,10 @@ static void btc_thread_handler(void *arg)
 static bt_status_t btc_task_post(btc_msg_t *msg, uint32_t timeout)
 {
     if (osi_thread_post(btc_thread, btc_thread_handler, msg, 0, timeout) == false) {
+        if (msg->arg) {
+            osi_free(msg->arg);
+        }
+        free(msg);
         return BT_STATUS_BUSY;
     }
 

components/bt/host/bluedroid/bta/sys/bta_sys_main.c

@@ -578,6 +578,14 @@ void bta_sys_sendmsg(void *p_msg)
     }
 }
 
+void bta_alarm_cb(void *data)
+{
+    assert(data != NULL);
+    TIMER_LIST_ENT *p_tle = (TIMER_LIST_ENT *)data;
+
+    btu_task_post(SIG_BTU_BTA_ALARM, p_tle, OSI_THREAD_MAX_TIMEOUT);
+}
+
 /*******************************************************************************
 **
 ** Function         bta_sys_start_timer
@@ -588,26 +596,25 @@ void bta_sys_sendmsg(void *p_msg)
 ** Returns          void
 **
 *******************************************************************************/
-void bta_alarm_cb(void *data)
-{
-    assert(data != NULL);
-    TIMER_LIST_ENT *p_tle = (TIMER_LIST_ENT *)data;
-
-    btu_task_post(SIG_BTU_BTA_ALARM, p_tle, OSI_THREAD_MAX_TIMEOUT);
-}
-
 void bta_sys_start_timer(TIMER_LIST_ENT *p_tle, UINT16 type, INT32 timeout_ms)
 {
     assert(p_tle != NULL);
 
     // Get the alarm for this p_tle.
+    osi_alarm_t *alarm;
     osi_mutex_lock(&bta_alarm_lock, OSI_MUTEX_MAX_TIMEOUT);
-    if (!hash_map_has_key(bta_alarm_hash_map, p_tle)) {
-        hash_map_set(bta_alarm_hash_map, p_tle, osi_alarm_new("bta_sys", bta_alarm_cb, p_tle, 0));
+    alarm = hash_map_get(bta_alarm_hash_map, p_tle);
+    if (!alarm) {
+        alarm = osi_alarm_new("bta_sys", bta_alarm_cb, p_tle, 0);
+        if (alarm) {
+            if (!hash_map_set(bta_alarm_hash_map, p_tle, alarm)) {
+                osi_alarm_free(alarm);
+                alarm = NULL;
+            }
+        }
     }
     osi_mutex_unlock(&bta_alarm_lock);
 
-    osi_alarm_t *alarm = hash_map_get(bta_alarm_hash_map, p_tle);
     if (alarm == NULL) {
         APPL_TRACE_ERROR("%s unable to create alarm.", __func__);
         return;