alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/free_memory_if_failed_to_strart_http_server' into 'master'

Browse Source 
fix(esp_https_server): fix memory leak during configuring http server

Closes IDFGH-12519

See merge request espressif/esp-idf!30233
This commit is contained in:
Nilesh Kale 2024-05-06 13:41:23 +08:00
commit ade6a5ec07
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_https_server/src/https_server.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2018-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -366,7 +366,6 @@ exit:
free((void *) cfg->cacert_buf); free((void *) cfg->cacert_buf);
} }
free(cfg); free(cfg);
free(*ssl_ctx);
return ret; return ret;
} }
@ -379,14 +378,17 @@ esp_err_t httpd_ssl_start(httpd_handle_t *pHandle, struct httpd_ssl_config *conf
ESP_LOGI(TAG, "Starting server"); ESP_LOGI(TAG, "Starting server");
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
httpd_ssl_ctx_t *ssl_ctx = NULL;
if (HTTPD_SSL_TRANSPORT_SECURE == config->transport_mode) { if (HTTPD_SSL_TRANSPORT_SECURE == config->transport_mode) {
httpd_ssl_ctx_t *ssl_ctx = calloc(1, sizeof(httpd_ssl_ctx_t)); ssl_ctx = calloc(1, sizeof(httpd_ssl_ctx_t));
if (!ssl_ctx) { if (!ssl_ctx) {
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
ret = create_secure_context(config, &ssl_ctx); ret = create_secure_context(config, &ssl_ctx);
if (ret != ESP_OK) { if (ret != ESP_OK) {
free(ssl_ctx);
return ret; return ret;
} }
@ -411,7 +413,11 @@ esp_err_t httpd_ssl_start(httpd_handle_t *pHandle, struct httpd_ssl_config *conf
httpd_handle_t handle = NULL; httpd_handle_t handle = NULL;
ret = httpd_start(&handle, &config->httpd); ret = httpd_start(&handle, &config->httpd);
if (ret != ESP_OK) return ret; if (ret != ESP_OK) {
free(ssl_ctx);
ssl_ctx = NULL;
return ret;
}
*pHandle = handle; *pHandle = handle;