From 9b507c45c86cf491466d705cd7896c6f6e500d0d Mon Sep 17 00:00:00 2001 From: David Cermak Date: Thu, 20 Jun 2019 17:48:11 +0200 Subject: [PATCH] ws_client: fix double delete issue in ws client initialization --- .../esp_websocket_client.c | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c index e545559dc..a066c288c 100644 --- a/components/esp_websocket_client/esp_websocket_client.c +++ b/components/esp_websocket_client/esp_websocket_client.c @@ -153,42 +153,24 @@ static esp_err_t esp_websocket_client_set_config(esp_websocket_client_handle_t c if (config->username) { free(cfg->username); cfg->username = strdup(config->username); - ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->username, { - free(cfg->host); - return ESP_ERR_NO_MEM; - }); + ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->username, return ESP_ERR_NO_MEM); } if (config->password) { free(cfg->password); cfg->password = strdup(config->password); - ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->password, { - free(cfg->host); - free(cfg->username); - return ESP_ERR_NO_MEM; - }); + ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->password, return ESP_ERR_NO_MEM); } if (config->uri) { free(cfg->uri); cfg->uri = strdup(config->uri); - ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->uri, { - free(cfg->host); - free(cfg->username); - free(cfg->password); - return ESP_ERR_NO_MEM; - }); + ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->uri, return ESP_ERR_NO_MEM); } if (config->path) { free(cfg->path); cfg->path = strdup(config->path); - ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->path, { - free(cfg->uri); - free(cfg->host); - free(cfg->username); - free(cfg->password); - return ESP_ERR_NO_MEM; - }); + ESP_WS_CLIENT_MEM_CHECK(TAG, cfg->path, return ESP_ERR_NO_MEM); } cfg->network_timeout_ms = WEBSOCKET_NETWORK_TIMEOUT_MS;