feedc0de/esp-mqtt
1
0
Fork 0
forked from espressif/esp-mqtt
Code Pull Requests Activity

fix possible double free of client config if init fails

Browse Source
This commit is contained in:
David Cermak
2020-01-19 22:01:44 +01:00
parent ed90a64551
commit bbcf078a2b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mqtt_client.c
View File

@ -402,8 +402,8 @@ esp_err_t esp_mqtt_set_config(esp_mqtt_client_handle_t client, const esp_mqtt_cl
// Set uri at the end of config to override separately configured uri elements // Set uri at the end of config to override separately configured uri elements
if (config->uri) { if (config->uri) {
if (esp_mqtt_client_set_uri(client, cfg->uri) != ESP_OK) { if (esp_mqtt_client_set_uri(client, cfg->uri) != ESP_OK) {
esp_mqtt_destroy_config(client); err = ESP_FAIL;
return ESP_FAIL; goto _mqtt_set_config_failed;
} }
} }
@ -419,6 +419,9 @@ _mqtt_set_config_failed:
static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client) static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client)
{ {
mqtt_config_storage_t *cfg = client->config; mqtt_config_storage_t *cfg = client->config;
if (cfg == NULL) {
return ESP_ERR_INVALID_STATE;
}
free(cfg->host); free(cfg->host);
free(cfg->uri); free(cfg->uri);
free(cfg->path); free(cfg->path);
@ -441,6 +444,7 @@ static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client)
#endif #endif
memset(cfg, 0, sizeof(mqtt_config_storage_t)); memset(cfg, 0, sizeof(mqtt_config_storage_t));
free(client->config); free(client->config);
client->config = NULL;
return ESP_OK; return ESP_OK;
} }