Fix ordering of free()ing of internal structures in ssl_server2

If `MBEDTLS_MEMORY_BUFFER_ALLOC_C` is configured and Mbed TLS'
custom buffer allocator is used for calloc() and free(), the
read buffer used by the server example application is allocated
from the buffer allocator, but freed after the buffer allocator
has been destroyed. If memory backtracing is enabled, this leaves
a memory leak in the backtracing structure allocated for the buffer,
as found by valgrind.

Fixes #2069.
This commit is contained in:
Hanno Becker 2018-10-09 12:39:13 +01:00
parent 5bcbd4e7f4
commit 7c2f2f3266

View File

@ -2495,6 +2495,8 @@ exit:
mbedtls_ssl_cookie_free( &cookie_ctx ); mbedtls_ssl_cookie_free( &cookie_ctx );
#endif #endif
mbedtls_free( buf );
#if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
#if defined(MBEDTLS_MEMORY_DEBUG) #if defined(MBEDTLS_MEMORY_DEBUG)
mbedtls_memory_buffer_alloc_status(); mbedtls_memory_buffer_alloc_status();
@ -2502,7 +2504,6 @@ exit:
mbedtls_memory_buffer_alloc_free(); mbedtls_memory_buffer_alloc_free();
#endif #endif
mbedtls_free( buf );
mbedtls_printf( " done.\n" ); mbedtls_printf( " done.\n" );
#if defined(_WIN32) #if defined(_WIN32)