yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-24 02:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in ssl_setup

Browse source
This commit is contained in:
k-stachowiak 2018-07-09 10:43:37 +02:00
parent b461ba5630
commit 4772a1fd3c
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
library/ssl_tls.c
View file

@ -5510,7 +5510,7 @@ void mbedtls_ssl_init( mbedtls_ssl_context *ssl )
int mbedtls_ssl_setup( mbedtls_ssl_context *ssl, int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
const mbedtls_ssl_config *conf ) const mbedtls_ssl_config *conf )
{ {
int ret; int err;
const size_t len = MBEDTLS_SSL_BUFFER_LEN; const size_t len = MBEDTLS_SSL_BUFFER_LEN;
ssl->conf = conf; ssl->conf = conf;
@ -5518,13 +5518,14 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
/* /*
* Prepare base structures * Prepare base structures
*/ */
ssl->in_buf = NULL;
ssl->out_buf = NULL;
if( ( ssl-> in_buf = mbedtls_calloc( 1, len ) ) == NULL || if( ( ssl-> in_buf = mbedtls_calloc( 1, len ) ) == NULL ||
( ssl->out_buf = mbedtls_calloc( 1, len ) ) == NULL ) ( ssl->out_buf = mbedtls_calloc( 1, len ) ) == NULL )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed", len ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed", len ) );
mbedtls_free( ssl->in_buf ); err = MBEDTLS_ERR_SSL_ALLOC_FAILED;
ssl->in_buf = NULL; goto error;
return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
} }
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)
@ -5558,10 +5559,33 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
ssl->in_msg = ssl->in_buf + 13; ssl->in_msg = ssl->in_buf + 13;
} }
if( ( ret = ssl_handshake_init( ssl ) ) != 0 ) if( ( err = ssl_handshake_init( ssl ) ) != 0 )
return( ret ); goto error;
return( 0 ); return( 0 );
error:
mbedtls_free( ssl->in_buf );
mbedtls_free( ssl->out_buf );
ssl->conf = NULL;
ssl->in_buf = NULL;
ssl->out_buf = NULL;
ssl->in_hdr = NULL;
ssl->in_ctr = NULL;
ssl->in_len = NULL;
ssl->in_iv = NULL;
ssl->in_msg = NULL;
ssl->out_hdr = NULL;
ssl->out_ctr = NULL;
ssl->out_len = NULL;
ssl->out_iv = NULL;
ssl->out_msg = NULL;
return( err );
} }
/* /*