espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 10:00:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_bt_coverity_v5.5' into 'release/v5.5'

Browse Source 
bugfix: Fix array compared against 0 in btc_manage.c and the issue of uninitialized pointer reading in coexist_printf (v5.5)

See merge request espressif/esp-idf!42066
This commit is contained in:
Wang Meng Yang
2025-09-24 17:52:00 +08:00
parent b8bd070517 c2c23e620a
commit cda5d90ad1
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/bt/common/btc/core/btc_manage.c
View File

@@ -8,19 +8,20 @@
#include "btc/btc_task.h"
#include "osi/thread.h"
#if BTC_DYNAMIC_MEMORY == FALSE
void *btc_profile_cb_tab[BTC_PID_NUM] = {};
#else
#if BTC_DYNAMIC_MEMORY == TRUE
void **btc_profile_cb_tab;
#else
void *btc_profile_cb_tab[BTC_PID_NUM] = {};
#endif
void esp_profile_cb_reset(void)
{
#if BTC_DYNAMIC_MEMORY == TRUE
if (btc_profile_cb_tab == NULL) {
#if BTC_DYNAMIC_MEMORY == TRUE
void *p = btc_profile_cb_tab;
if (p == NULL) {
return;
}
#endif
#endif
int i;
@@ -31,11 +32,12 @@ void esp_profile_cb_reset(void)
int btc_profile_cb_set(btc_pid_t profile_id, void *cb)
{
#if BTC_DYNAMIC_MEMORY == TRUE
if (btc_profile_cb_tab == NULL) {
#if BTC_DYNAMIC_MEMORY == TRUE
void *p = btc_profile_cb_tab;
if (p == NULL) {
return -1;
}
#endif
#endif
if (profile_id < 0 || profile_id >= BTC_PID_NUM) {
return -1;
@@ -48,11 +50,12 @@ int btc_profile_cb_set(btc_pid_t profile_id, void *cb)
void *btc_profile_cb_get(btc_pid_t profile_id)
{
#if BTC_DYNAMIC_MEMORY == TRUE
if (btc_profile_cb_tab == NULL) {
#if BTC_DYNAMIC_MEMORY == TRUE
void *p = btc_profile_cb_tab;
if (p == NULL) {
return NULL;
}
#endif
#endif
if (profile_id < 0 || profile_id >= BTC_PID_NUM) {
return NULL;

4
components/esp_coex/src/lib_printf.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2016-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2016-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -44,7 +44,7 @@ static int lib_printf(const char* tag, const char* format, va_list arg)
int coexist_printf(const char* format, ...)
{
va_list arg;
va_list arg = {};
va_start(arg, format);
int res = lib_printf("coexist", format, arg);
va_end(arg);