Skip to content

Commit

Permalink
Merge branch 'contrib/github_pr_13945' into 'master'
Browse files Browse the repository at this point in the history
fix(esp_http_client): Do not allocate client->if_name twice in esp_http_client_init. (GitHub PR)

Closes IDFGH-12994

See merge request espressif/esp-idf!31497
  • Loading branch information
mahavirj committed Jun 20, 2024
2 parents c9a504c + adb307d commit f0781c4
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions components/esp_http_client/esp_http_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,9 +662,11 @@ static bool init_common_tcp_transport(esp_http_client_handle_t client, const esp
}

if (config->if_name) {
client->if_name = calloc(1, sizeof(struct ifreq));
ESP_RETURN_ON_FALSE(client->if_name, false, TAG, "Memory exhausted");
memcpy(client->if_name, config->if_name, sizeof(struct ifreq));
if (client->if_name == NULL) {
client->if_name = calloc(1, sizeof(struct ifreq));
ESP_RETURN_ON_FALSE(client->if_name, false, TAG, "Memory exhausted");
memcpy(client->if_name, config->if_name, sizeof(struct ifreq));
}
esp_transport_tcp_set_interface_name(transport, client->if_name);
}
return true;
Expand Down

0 comments on commit f0781c4

Please sign in to comment.