Fix another potential memory leak found by find-mem-leak.cocci.

This commit is contained in:
Mansour Moufid 2015-02-17 13:51:16 -05:00
parent 263438b071
commit 5811d3e4ef

View file

@ -419,13 +419,13 @@ sni_entry *sni_parse( char *sni_string )
while( p <= end ) while( p <= end )
{ {
if( ( new = polarssl_malloc( sizeof( sni_entry ) ) ) == NULL ) if( ( new = polarssl_malloc( sizeof( sni_entry ) ) ) == NULL )
return( NULL ); goto error;
memset( new, 0, sizeof( sni_entry ) ); memset( new, 0, sizeof( sni_entry ) );
if( ( new->cert = polarssl_malloc( sizeof( x509_crt ) ) ) == NULL || if( ( new->cert = polarssl_malloc( sizeof( x509_crt ) ) ) == NULL ||
( new->key = polarssl_malloc( sizeof( pk_context ) ) ) == NULL ) ( new->key = polarssl_malloc( sizeof( pk_context ) ) ) == NULL )
return( NULL ); goto error;
x509_crt_init( new->cert ); x509_crt_init( new->cert );
pk_init( new->key ); pk_init( new->key );
@ -436,13 +436,17 @@ sni_entry *sni_parse( char *sni_string )
if( x509_crt_parse_file( new->cert, crt_file ) != 0 || if( x509_crt_parse_file( new->cert, crt_file ) != 0 ||
pk_parse_keyfile( new->key, key_file, "" ) != 0 ) pk_parse_keyfile( new->key, key_file, "" ) != 0 )
return( NULL ); goto error;
new->next = cur; new->next = cur;
cur = new; cur = new;
} }
return( cur ); return( cur );
error:
sni_free( new );
return( NULL );
} }
void sni_free( sni_entry *head ) void sni_free( sni_entry *head )