yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 09:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid possible dangling pointers

Browse Source 
If the allocation fails, we don't really want ssl->in_ctr = 8 lying around.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-02-18 10:32:41 +00:00
parent f45850c493
commit f7db5e0a4a
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/ssl_tls.c
View File

@ -3628,23 +3628,8 @@ int ssl_init( ssl_context *ssl )
/* /*
* Prepare base structures * Prepare base structures
*/ */
ssl->in_ctr = polarssl_malloc( len ); if( ( ssl->in_ctr = polarssl_malloc( len ) ) == NULL ||
ssl->in_hdr = ssl->in_ctr + 8; ( ssl->out_ctr = polarssl_malloc( len ) ) == NULL )
ssl->in_iv = ssl->in_ctr + 13;
ssl->in_msg = ssl->in_ctr + 13;
if( ssl->in_ctr == NULL )
{
SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len ) );
return( POLARSSL_ERR_SSL_MALLOC_FAILED );
}
ssl->out_ctr = polarssl_malloc( len );
ssl->out_hdr = ssl->out_ctr + 8;
ssl->out_iv = ssl->out_ctr + 13;
ssl->out_msg = ssl->out_ctr + 13;
if( ssl->out_ctr == NULL )
{ {
SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len ) ); SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len ) );
polarssl_free( ssl->in_ctr ); polarssl_free( ssl->in_ctr );
@ -3655,6 +3640,14 @@ int ssl_init( ssl_context *ssl )
memset( ssl-> in_ctr, 0, SSL_BUFFER_LEN ); memset( ssl-> in_ctr, 0, SSL_BUFFER_LEN );
memset( ssl->out_ctr, 0, SSL_BUFFER_LEN ); memset( ssl->out_ctr, 0, SSL_BUFFER_LEN );
ssl->in_hdr = ssl->in_ctr + 8;
ssl->in_iv = ssl->in_ctr + 13;
ssl->in_msg = ssl->in_ctr + 13;
ssl->out_hdr = ssl->out_ctr + 8;
ssl->out_iv = ssl->out_ctr + 13;
ssl->out_msg = ssl->out_ctr + 13;
#if defined(POLARSSL_SSL_ENCRYPT_THEN_MAC) #if defined(POLARSSL_SSL_ENCRYPT_THEN_MAC)
ssl->encrypt_then_mac = SSL_ETM_ENABLED; ssl->encrypt_then_mac = SSL_ETM_ENABLED;
#endif #endif