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

Merge branch 'fix/coverity_console' into 'master'

Browse Source 
fix(system): Fixes Coverity issues

Closes IDF-13862, IDF-13869, IDF-13872, IDF-13873, IDF-13910, IDF-13908, IDF-13863, IDF-13878, IDF-13903, IDF-13902, and IDF-13907

See merge request espressif/esp-idf!41414
This commit is contained in:
Konstantin Kondrashov
2025-08-28 03:15:35 +08:00
parent b191c34647 91a2744d44
commit e2a1a7be35
7 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/console/argtable3/arg_dstr.c
View File

@@ -221,7 +221,7 @@ void arg_dstr_catc(arg_dstr_t ds, char c) {
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
void arg_dstr_catf(arg_dstr_t ds, const char* fmt, ...) {
va_list arglist;
va_list arglist = {0};
char* buff;
int n, r;
size_t slen;

4
components/console/argtable3/arg_utils.c
View File

@@ -50,14 +50,14 @@ static void panic(const char* fmt, ...);
static arg_panicfn* s_panic = panic;
void dbg_printf(const char* fmt, ...) {
va_list args;
va_list args = {0};
va_start(args, fmt);
vfprintf(stderr, fmt, args);
va_end(args);
}
static void panic(const char* fmt, ...) {
va_list args;
va_list args = {0};
char* s;
va_start(args, fmt);

73
components/heap/heap_caps.c
View File

@@ -171,22 +171,27 @@ HEAP_IRAM_ATTR void *heap_caps_realloc_default( void *ptr, size_t size )
*/
HEAP_IRAM_ATTR void *heap_caps_malloc_prefer( size_t size, size_t num, ... )
{
va_list argp;
va_start( argp, num );
void *r = NULL;
uint32_t caps = MALLOC_CAP_DEFAULT;
while (num--) {
caps = va_arg( argp, uint32_t );
r = heap_caps_malloc_base( size, caps );
if (r != NULL || size == 0) {
break;
if (num > 0) {
va_list argp = {0};
va_start(argp, num);
for ( ; num > 0; --num) {
caps = va_arg(argp, uint32_t);
r = heap_caps_malloc_base(size, caps);
if (r != NULL || size == 0) {
break;
}
}
va_end( argp );
}
if (r == NULL && size > 0){
if (r == NULL && size > 0) {
heap_caps_alloc_failed(size, caps, __func__);
}
va_end( argp );
return r;
}
@@ -195,46 +200,58 @@ HEAP_IRAM_ATTR void *heap_caps_malloc_prefer( size_t size, size_t num, ... )
*/
HEAP_IRAM_ATTR void *heap_caps_realloc_prefer( void *ptr, size_t size, size_t num, ... )
{
va_list argp;
va_start( argp, num );
void *r = NULL;
uint32_t caps = MALLOC_CAP_DEFAULT;
while (num--) {
caps = va_arg( argp, uint32_t );
r = heap_caps_realloc_base( ptr, size, caps );
if (r != NULL || size == 0) {
break;
if (num > 0) {
va_list argp = {0};
va_start(argp, num);
for ( ; num > 0; --num) {
caps = va_arg(argp, uint32_t);
r = heap_caps_realloc_base(ptr, size, caps);
if (r != NULL || size == 0) {
break;
}
}
va_end( argp );
}
if (r == NULL && size > 0){
if (r == NULL && size > 0) {
heap_caps_alloc_failed(size, caps, __func__);
}
va_end( argp );
return r;
}
/*
Memory callocation as preference in decreasing order.
*/
HEAP_IRAM_ATTR void *heap_caps_calloc_prefer( size_t n, size_t size, size_t num, ... )
HEAP_IRAM_ATTR void *heap_caps_calloc_prefer(size_t n, size_t size, size_t num, ...)
{
va_list argp;
va_start( argp, num );
void *r = NULL;
uint32_t caps = MALLOC_CAP_DEFAULT;
while (num--) {
caps = va_arg( argp, uint32_t );
r = heap_caps_calloc_base( n, size, caps );
if (r != NULL || size == 0){
break;
if (num > 0) {
va_list argp = {0};
va_start(argp, num);
for (; num > 0; --num) {
caps = va_arg(argp, uint32_t);
r = heap_caps_calloc_base(n, size, caps);
if (r != NULL || size == 0) {
break;
}
}
va_end(argp);
}
if (r == NULL && size > 0){
if (r == NULL && size > 0) {
heap_caps_alloc_failed(size, caps, __func__);
}
va_end( argp );
return r;
}

2
components/log/src/log.c
View File

@@ -83,7 +83,7 @@ void __attribute__((optimize("-O3"))) esp_log(esp_log_config_t config, const cha
#else // ESP_LOG_VERSION == 2
if (is_level_loggable(config)) {
#endif
va_list args;
va_list args = {0};
va_start(args, format);
esp_log_va(config, tag, format, args);
va_end(args);

2
components/log/src/log_print.c
View File

@@ -12,7 +12,7 @@
void esp_log_printf(esp_log_config_t config, const char *format, ...)
{
va_list args;
va_list args = {0};
va_start(args, format);
esp_log_vprintf(config, format, args);
va_end(args);

2
components/log/src/os/log_write.c
View File

@@ -37,7 +37,7 @@ void esp_log_write(esp_log_level_t level,
const char *tag,
const char *format, ...)
{
va_list list;
va_list list = {0};
va_start(list, format);
esp_log_va(ESP_LOG_CONFIG_INIT(level), tag, format, list);
va_end(list);

2
components/rt/FreeRTOS_POSIX_mqueue.c
View File

@@ -506,7 +506,7 @@ mqd_t mq_open( const char * name,
if( oflag & O_CREAT )
{
va_list args;
va_list args = {0};
va_start( args, oflag );
mode = va_arg( args, mode_t );
attr = va_arg( args, struct mq_attr * );