Merge remote-tracking branch 'public/pr/1611' into mbedtls-2.1
diff --git a/ChangeLog b/ChangeLog
index 23461be..316009d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
mbed TLS ChangeLog (Sorted per branch, date)
-= mbed TLS 2.1.13 branch released 2018-xx-xx
+= mbed TLS x.x.x branch released xxxx-xx-xx
Bugfix
+
+ * Fix braces in mbedtls_memory_buffer_alloc_status(). Found by sbranden, #552.
* Added the macro MBEDTLS_X509_MAX_FILE_PATH_LEN that enables the user to
configure the maximum length of a file path that can be buffered when
calling mbedtls_x509_crt_parse_path().
diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c
index 1cfc27c..eb555f3 100644
--- a/library/memory_buffer_alloc.c
+++ b/library/memory_buffer_alloc.c
@@ -522,7 +522,9 @@
heap.alloc_count, heap.free_count );
if( heap.first->next == NULL )
+ {
mbedtls_fprintf( stderr, "All memory de-allocated in stack buffer\n" );
+ }
else
{
mbedtls_fprintf( stderr, "Memory currently allocated:\n" );