From f1c0fc0bbd03f7f8ed97d903d11907ce83c7424e Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Fri, 5 Jul 2024 23:29:26 +0700 Subject: [PATCH] fix(bt): fix alloc-size warning Warning: allocation of insufficient size '36' for type 'tBTA_DM_MSG' with size '320' [-Werror=alloc-size] --- components/bt/host/bluedroid/bta/dm/bta_dm_act.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c index ec2ce657fd..0ff6dc6c2c 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -2385,7 +2385,12 @@ void bta_dm_queue_search (tBTA_DM_MSG *p_data) osi_free(bta_dm_search_cb.p_search_queue); } - bta_dm_search_cb.p_search_queue = (tBTA_DM_MSG *)osi_malloc(sizeof(tBTA_DM_API_SEARCH)); + tBTA_DM_API_SEARCH *search_queue = osi_malloc(sizeof(tBTA_DM_API_SEARCH)); + if (search_queue == NULL) { + APPL_TRACE_ERROR("%s: couldn't allocate memory", __func__); + return; + } + bta_dm_search_cb.p_search_queue = (tBTA_DM_MSG *) search_queue; memcpy(bta_dm_search_cb.p_search_queue, p_data, sizeof(tBTA_DM_API_SEARCH)); } @@ -2406,7 +2411,12 @@ void bta_dm_queue_disc (tBTA_DM_MSG *p_data) osi_free(bta_dm_search_cb.p_search_queue); } - bta_dm_search_cb.p_search_queue = (tBTA_DM_MSG *)osi_malloc(sizeof(tBTA_DM_API_DISCOVER)); + tBTA_DM_API_DISCOVER *search_queue = osi_malloc(sizeof(tBTA_DM_API_DISCOVER)); + if (search_queue == NULL) { + APPL_TRACE_ERROR("%s: couldn't allocate memory", __func__); + return; + } + bta_dm_search_cb.p_search_queue = (tBTA_DM_MSG *)search_queue; memcpy(bta_dm_search_cb.p_search_queue, p_data, sizeof(tBTA_DM_API_DISCOVER)); } #endif ///SDP_INCLUDED == TRUE