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

Cleaned up location of init and free for some programs to prevent memory

leaks on incorrect arguments
This commit is contained in:
Paul Bakker
2014-04-17 16:02:36 +02:00
parent cbe3d0d5cc
commit 0c22610693
19 changed files with 95 additions and 48 deletions

View File

@ -339,30 +339,44 @@ sni_entry *sni_parse( char *sni_string )
if( ( new->cert = polarssl_malloc( sizeof( x509_crt ) ) ) == NULL ||
( new->key = polarssl_malloc( sizeof( pk_context ) ) ) == NULL )
return( NULL );
{
cur = NULL;
goto exit;
}
x509_crt_init( new->cert );
pk_init( new->key );
new->name = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
crt_file = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
key_file = p;
while( *p != ',' ) if( ++p > end ) return( NULL );
while( *p != ',' ) if( ++p > end ) { cur = NULL; goto exit; }
*p++ = '\0';
if( x509_crt_parse_file( new->cert, crt_file ) != 0 ||
pk_parse_keyfile( new->key, key_file, "" ) != 0 )
return( NULL );
{
cur = NULL;
goto exit;
}
new->next = cur;
cur = new;
new = NULL;
}
exit:
if( new != NULL )
{
x509_crt_free( new->cert);
pk_free( new->key );
polarssl_free( new );
}
return( cur );
@ -1345,7 +1359,9 @@ exit:
}
#endif
net_close( client_fd );
if( client_fd != -1 )
net_close( client_fd );
#if defined(POLARSSL_X509_CRT_PARSE_C)
x509_crt_free( &cacert );
x509_crt_free( &srvcert );