espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/https_server_mem_leak_for_error_ret' into 'master'

Browse Source 
Fix/https server mem leak for error ret

Closes IDFGH-4300

See merge request espressif/esp-idf!11369
This commit is contained in:
Mahavir Jain
2020-11-26 00:11:58 +08:00
parent a8983a72a1 df0b016cfd
commit 0a933f66e3
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,6 +175,7 @@ static httpd_ssl_ctx_t *create_secure_context(const struct httpd_ssl_config *con
if (!cfg->cacert_buf) { if (!cfg->cacert_buf) {
ESP_LOGE(TAG, "Could not allocate memory"); ESP_LOGE(TAG, "Could not allocate memory");
free(cfg); free(cfg);
free(ssl_ctx);
return NULL; return NULL;
} }
memcpy((char *)cfg->cacert_buf, config->client_verify_cert_pem, config->client_verify_cert_len); memcpy((char *)cfg->cacert_buf, config->client_verify_cert_pem, config->client_verify_cert_len);
@@ -186,6 +187,7 @@ static httpd_ssl_ctx_t *create_secure_context(const struct httpd_ssl_config *con
ESP_LOGE(TAG, "Could not allocate memory"); ESP_LOGE(TAG, "Could not allocate memory");
free((void *)cfg->cacert_buf); free((void *)cfg->cacert_buf);
free(cfg); free(cfg);
free(ssl_ctx);
return NULL; return NULL;
} }
memcpy((char *)cfg->servercert_buf, config->cacert_pem, config->cacert_len); memcpy((char *)cfg->servercert_buf, config->cacert_pem, config->cacert_len);
@@ -197,6 +199,7 @@ static httpd_ssl_ctx_t *create_secure_context(const struct httpd_ssl_config *con
free((void *)cfg->servercert_buf); free((void *)cfg->servercert_buf);
free((void *)cfg->cacert_buf); free((void *)cfg->cacert_buf);
free(cfg); free(cfg);
free(ssl_ctx);
return NULL; return NULL;
} }
memcpy((char *)cfg->serverkey_buf, config->prvtkey_pem, config->prvtkey_len); memcpy((char *)cfg->serverkey_buf, config->prvtkey_pem, config->prvtkey_len);

2
examples/protocols/mqtt/ssl_ds/configure_ds.py
View File

@@ -117,7 +117,7 @@ def efuse_summary(args):
def efuse_burn_key(args): def efuse_burn_key(args):
os.system("python $IDF_PATH/components/esptool_py/esptool/espefuse.py --chip esp32s2 -p %s burn_key" os.system("python $IDF_PATH/components/esptool_py/esptool/espefuse.py --chip esp32s2 -p %s burn_key "
"%s %s HMAC_DOWN_DIGITAL_SIGNATURE --no-read-protect" "%s %s HMAC_DOWN_DIGITAL_SIGNATURE --no-read-protect"
% ((args.port), ("BLOCK_KEY" + str(args.efuse_key_id)), (hmac_key_file))) % ((args.port), ("BLOCK_KEY" + str(args.efuse_key_id)), (hmac_key_file)))