Skip to content

fix: address coverity reported warnings #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahavirj merged 1 commit into from
Dec 1, 2025
Merged

fix: address coverity reported warnings #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions esp_cli_commands/src/esp_cli_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <unistd.h>
#include "freertos/FreeRTOS.h"
Expand Down Expand Up @@ -56,10 +57,10 @@ static esp_cli_commands_config_t s_config = {
++_i)

/**
* @brief returns the number of commands registered
* in the .esp_cli_commands section
* @brief Get the number of commands registered in the .esp_cli_commands section
*/
#define ESP_CLI_COMMANDS_COUNT (size_t)(&_esp_cli_commands_end - &_esp_cli_commands_start)
#define ESP_CLI_COMMANDS_COUNT \
(((uintptr_t)&_esp_cli_commands_end - (uintptr_t)&_esp_cli_commands_start) / sizeof(esp_cli_command_t))

/**
* @brief Lock access to the s_config static structure
Expand Down
18 changes: 16 additions & 2 deletions esp_encrypted_img/src/esp_encrypted_img.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,10 +826,24 @@ static esp_err_t process_bin(esp_encrypted_img_t *handle, pre_enc_decrypt_arg_t
return ESP_ERR_NOT_FINISHED;
}
data_out_size = handle->cache_buf_len + data_len - curr_index;
args->data_out = realloc(args->data_out, data_out_size);
if (!args->data_out) {

/* Handle zero-size allocation edge case to avoid undefined behavior */
if (data_out_size == 0) {
if (args->data_out) {
free(args->data_out);
args->data_out = NULL;
}
args->data_out_len = 0;
return ESP_OK;
}

/* Use temporary pointer to prevent memory leak if realloc fails */
void *temp = realloc(args->data_out, data_out_size);
if (!temp) {
/* Original pointer remains valid, caller should free it */
return ESP_ERR_NO_MEM;
}
args->data_out = temp;
size_t copy_len = 0;

copy_len = MIN(CACHE_BUF_SIZE - handle->cache_buf_len, data_len - curr_index);
Expand Down
87 changes: 68 additions & 19 deletions sh2lib/sh2lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ static int callback_error(nghttp2_session *session, int lib_error_code,
static ssize_t callback_send(nghttp2_session *session, const uint8_t *data,
size_t length, int flags, void *user_data)
{
int rv = 0;
ssize_t rv = 0;
struct sh2lib_handle *hd = user_data;

int copy_offset = 0;
int pending_data = length;
size_t copy_offset = 0;
size_t pending_data = length;

/* Send data in 1000 byte chunks */
while (copy_offset != length) {
int chunk_len = pending_data > 1000 ? 1000 : pending_data;
int subrv = callback_send_inner(hd, data + copy_offset, chunk_len);
while (copy_offset < length) {
size_t chunk_len = pending_data > 1000 ? 1000 : pending_data;
ssize_t subrv = callback_send_inner(hd, data + copy_offset, chunk_len);
if (subrv <= 0) {
if (copy_offset == 0) {
/* If no data is transferred, send the error code */
Expand Down Expand Up @@ -143,10 +143,8 @@ static int callback_on_frame_send(nghttp2_session *session,
ESP_LOGD(TAG, "[frame-send] C ----------------------------> S (HEADERS)");
#if DBG_FRAME_SEND
ESP_LOGD(TAG, "[frame-send] headers nv-len = %d", frame->headers.nvlen);
const nghttp2_nv *nva = frame->headers.nva;
size_t i;
for (i = 0; i < frame->headers.nvlen; ++i) {
ESP_LOGD(TAG, "[frame-send] %s : %s", nva[i].name, nva[i].value);
for (size_t i = 0; i < frame->headers.nvlen; ++i) {
ESP_LOGD(TAG, "[frame-send] %s : %s", frame->headers.nva[i].name, frame->headers.nva[i].value);
}
#endif
}
Expand Down Expand Up @@ -228,7 +226,11 @@ static int do_http2_connect(struct sh2lib_handle *hd)
{
int ret;
nghttp2_session_callbacks *callbacks;
nghttp2_session_callbacks_new(&callbacks);
ret = nghttp2_session_callbacks_new(&callbacks);
if (ret != 0) {
ESP_LOGE(TAG, "[sh2-connect] Failed to create session callbacks");
return -1;
}
nghttp2_session_callbacks_set_error_callback2(callbacks, callback_error);
nghttp2_session_callbacks_set_send_callback(callbacks, callback_send);
nghttp2_session_callbacks_set_recv_callback(callbacks, callback_recv);
Expand All @@ -251,20 +253,23 @@ static int do_http2_connect(struct sh2lib_handle *hd)
ret = nghttp2_submit_settings(hd->http2_sess, NGHTTP2_FLAG_NONE, NULL, 0);
if (ret != 0) {
ESP_LOGE(TAG, "[sh2-connect] Submit settings failed");
/* Clean up session to prevent memory leak on error path */
nghttp2_session_del(hd->http2_sess);
hd->http2_sess = NULL;
return -1;
}
return 0;
}

int sh2lib_connect(struct sh2lib_config_t *cfg, struct sh2lib_handle *hd)
{
memset(hd, 0, sizeof(*hd));

if (cfg == NULL) {
ESP_LOGE(TAG, "[sh2-connect] pointer to sh2lib configurations cannot be NULL");
goto error;
if (hd == NULL || cfg == NULL || cfg->uri == NULL) {
ESP_LOGE(TAG, "[sh2-connect] Invalid argument");
return -1;
}

memset(hd, 0, sizeof(*hd));

const char *proto[] = {"h2", NULL};
esp_tls_cfg_t tls_cfg = {
.alpn_protos = proto,
Expand Down Expand Up @@ -294,8 +299,19 @@ int sh2lib_connect(struct sh2lib_config_t *cfg, struct sh2lib_handle *hd)

struct http_parser_url u;
http_parser_url_init(&u);
http_parser_parse_url(cfg->uri, strlen(cfg->uri), 0, &u);
if (http_parser_parse_url(cfg->uri, strlen(cfg->uri), 0, &u) != 0) {
ESP_LOGE(TAG, "[sh2-connect] Failed to parse URI");
goto error;
}
if (!(u.field_set & (1 << UF_HOST))) {
ESP_LOGE(TAG, "[sh2-connect] Host field not present in URI");
goto error;
}
hd->hostname = strndup(&cfg->uri[u.field_data[UF_HOST].off], u.field_data[UF_HOST].len);
if (!hd->hostname) {
ESP_LOGE(TAG, "[sh2-connect] Failed to allocate memory for hostname");
goto error;
}

/* HTTP/2 Connection */
if (do_http2_connect(hd) != 0) {
Expand All @@ -311,6 +327,10 @@ int sh2lib_connect(struct sh2lib_config_t *cfg, struct sh2lib_handle *hd)

void sh2lib_free(struct sh2lib_handle *hd)
{
if (hd == NULL) {
return;
}

if (hd->http2_sess) {
nghttp2_session_del(hd->http2_sess);
hd->http2_sess = NULL;
Expand All @@ -327,6 +347,11 @@ void sh2lib_free(struct sh2lib_handle *hd)

int sh2lib_execute(struct sh2lib_handle *hd)
{
if (hd == NULL) {
ESP_LOGE(TAG, "[sh2-execute] Invalid argument");
return -1;
}

int ret;
ret = sh2lib_execute_send(hd);
if (ret != 0) {
Expand All @@ -344,7 +369,7 @@ int sh2lib_execute(struct sh2lib_handle *hd)
int sh2lib_execute_recv(struct sh2lib_handle *hd)
{
if (hd == NULL) {
ESP_LOGE(TAG, "[sh2-execute-recv] pointer to sh2lib handle cannot be NULL");
ESP_LOGE(TAG, "[sh2-execute-recv] Invalid argument");
return -1;
}

Expand All @@ -359,7 +384,7 @@ int sh2lib_execute_recv(struct sh2lib_handle *hd)
int sh2lib_execute_send(struct sh2lib_handle *hd)
{
if (hd == NULL) {
ESP_LOGE(TAG, "[sh2-execute-recv] pointer to sh2lib handle cannot be NULL");
ESP_LOGE(TAG, "[sh2-execute-send] Invalid argument");
return -1;
}

Expand All @@ -373,6 +398,11 @@ int sh2lib_execute_send(struct sh2lib_handle *hd)

int sh2lib_do_get_with_nv(struct sh2lib_handle *hd, const nghttp2_nv *nva, size_t nvlen, sh2lib_frame_data_recv_cb_t recv_cb)
{
if (hd == NULL || (nva == NULL && nvlen > 0)) {
ESP_LOGE(TAG, "[sh2-do-get] Invalid argument");
return -1;
}

int ret = nghttp2_submit_request(hd->http2_sess, NULL, nva, nvlen, NULL, recv_cb);
if (ret < 0) {
ESP_LOGE(TAG, "[sh2-do-get] HEADERS call failed %i", ret);
Expand All @@ -382,6 +412,11 @@ int sh2lib_do_get_with_nv(struct sh2lib_handle *hd, const nghttp2_nv *nva, size_

int sh2lib_do_get(struct sh2lib_handle *hd, const char *path, sh2lib_frame_data_recv_cb_t recv_cb)
{
if (hd == NULL || path == NULL || hd->hostname == NULL) {
ESP_LOGE(TAG, "[sh2-do-get] Invalid argument");
return -1;
}

const nghttp2_nv nva[] = { SH2LIB_MAKE_NV(":method", "GET"),
SH2LIB_MAKE_NV(":scheme", "https"),
SH2LIB_MAKE_NV(":authority", hd->hostname),
Expand All @@ -403,6 +438,10 @@ int sh2lib_do_putpost_with_nv(struct sh2lib_handle *hd, const nghttp2_nv *nva, s
sh2lib_putpost_data_cb_t send_cb,
sh2lib_frame_data_recv_cb_t recv_cb)
{
if (hd == NULL || (nva == NULL && nvlen > 0) || send_cb == NULL) {
ESP_LOGE(TAG, "[sh2-do-putpost] Invalid argument");
return -1;
}

nghttp2_data_provider sh2lib_data_provider;
sh2lib_data_provider.read_callback = sh2lib_data_provider_cb;
Expand All @@ -418,6 +457,11 @@ int sh2lib_do_post(struct sh2lib_handle *hd, const char *path,
sh2lib_putpost_data_cb_t send_cb,
sh2lib_frame_data_recv_cb_t recv_cb)
{
if (hd == NULL || path == NULL || send_cb == NULL || hd->hostname == NULL) {
ESP_LOGE(TAG, "[sh2-do-post] Invalid argument");
return -1;
}

const nghttp2_nv nva[] = { SH2LIB_MAKE_NV(":method", "POST"),
SH2LIB_MAKE_NV(":scheme", "https"),
SH2LIB_MAKE_NV(":authority", hd->hostname),
Expand All @@ -430,6 +474,11 @@ int sh2lib_do_put(struct sh2lib_handle *hd, const char *path,
sh2lib_putpost_data_cb_t send_cb,
sh2lib_frame_data_recv_cb_t recv_cb)
{
if (hd == NULL || path == NULL || send_cb == NULL || hd->hostname == NULL) {
ESP_LOGE(TAG, "[sh2-do-put] Invalid argument");
return -1;
}

const nghttp2_nv nva[] = { SH2LIB_MAKE_NV(":method", "PUT"),
SH2LIB_MAKE_NV(":scheme", "https"),
SH2LIB_MAKE_NV(":authority", hd->hostname),
Expand Down
Loading