1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

Merge branch 'iotssl-517-double-free-restricted' into development-restricted

* iotssl-517-double-free-restricted:
  Fix potential double-free in ssl_conf_psk()
This commit is contained in:
Manuel Pégourié-Gonnard
2015-11-02 11:03:32 +09:00
2 changed files with 5 additions and 0 deletions

View File

@ -5772,6 +5772,8 @@ int mbedtls_ssl_conf_psk( mbedtls_ssl_config *conf,
{
mbedtls_free( conf->psk );
mbedtls_free( conf->psk_identity );
conf->psk = NULL;
conf->psk_identity = NULL;
}
if( ( conf->psk = mbedtls_calloc( 1, psk_len ) ) == NULL ||