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

Merge remote-tracking branch 'rasp/mem-leak' into development

Browse Source 
* rasp/mem-leak:
  Fix another potential memory leak found by find-mem-leak.cocci.
  Add a rule for another type of memory leak to find-mem-leak.cocci.
  Fix a potential memory leak found by find-mem-leak.cocci.
  Add a semantic patch to find potential memory leaks.
  Fix whitespace of 369e6c20.
  Apply the semantic patch rm-malloc-cast.cocci.
  Add a semantic patch to remove casts of malloc.

Conflicts:
	programs/ssl/ssl_server2.c
This commit is contained in:
Manuel Pégourié-Gonnard
2015-02-18 10:07:22 +00:00
parent b199095ec9 5811d3e4ef
commit ac08b543db
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/ssl_tls.c
View File

@ -4064,8 +4064,13 @@ int ssl_set_psk( ssl_context *ssl, const unsigned char *psk, size_t psk_len,
ssl->psk = polarssl_malloc( ssl->psk_len );
ssl->psk_identity = polarssl_malloc( ssl->psk_identity_len );
if( ssl->psk == NULL || ssl->psk_identity == NULL )
if( ssl->psk == NULL )
return( POLARSSL_ERR_SSL_MALLOC_FAILED );
if( ssl->psk_identity == NULL )
{
polarssl_free( ssl->psk );
return( POLARSSL_ERR_SSL_MALLOC_FAILED );
}
memcpy( ssl->psk, psk, ssl->psk_len );
memcpy( ssl->psk_identity, psk_identity, ssl->psk_identity_len );