Merge branch 'development' into dtls
* development:
Avoid possible dangling pointers
Conflicts:
library/ssl_tls.c
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 052a198..b09ee53 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4925,16 +4925,12 @@
/*
* Prepare base structures
*/
- ssl->in_buf = polarssl_malloc( len );
- ssl->out_buf = polarssl_malloc( len );
-
- if( ssl->in_buf == NULL || ssl->out_buf == NULL )
+ if( ( ssl->in_buf = polarssl_malloc( len ) ) == NULL ||
+ ( ssl->out_buf = polarssl_malloc( len ) ) == NULL )
{
SSL_DEBUG_MSG( 1, ( "malloc(%d bytes) failed", len ) );
polarssl_free( ssl->in_buf );
- polarssl_free( ssl->out_buf );
ssl->in_buf = NULL;
- ssl->out_buf = NULL;
return( POLARSSL_ERR_SSL_MALLOC_FAILED );
}