commit edf0076a0056e9f71e02ff2a60a47b8838a1848d
author Gilles Peskine <gilles.peskine@arm.com> Mon Apr 20 12:02:51 2020 +0200
committer GitHub <noreply@github.com> Mon Apr 20 12:02:51 2020 +0200
tree a261791712e3fd58bdc7b505b9e97d9c8a70a620
parent 12c299caeac555d036d05ec0b69eccce4a4e9583
parent e675a8d9bbc9232af5a09f05be5a30414bf24a26

Merge pull request #3198 from mpg/fix-overflow-benchmark-2.16

[backport 2.16] Fix arithmetic overflow in benchmark

programs/test/benchmark.c

diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 9c06d07..0835107 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -155,6 +155,16 @@
 
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) && defined(MBEDTLS_MEMORY_DEBUG)
 
+/* How much space to reserve for the title when printing heap usage results.
+ * Updated manually as the output of the following command:
+ *
+ *  sed -n 's/.*[T]IME_PUBLIC.*"\(.*\)",/\1/p' programs/test/benchmark.c |
+ *      awk '{print length+2}' | sort -rn | head -n1
+ *
+ * This computes the maximum length of a title +2 (because we appends "/s").
+ * (If the value is too small, the only consequence is poor alignement.) */
+#define TITLE_SPACE 11
+
 #define MEMORY_MEASURE_INIT                                             \
     size_t max_used, max_blocks, max_bytes;                             \
     size_t prv_used, prv_blocks;                                        \
@@ -163,7 +173,8 @@
 
 #define MEMORY_MEASURE_PRINT( title_len )                               \
     mbedtls_memory_buffer_alloc_max_get( &max_used, &max_blocks );      \
-    for( ii = 12 - (title_len); ii != 0; ii-- ) mbedtls_printf( " " );  \
+    ii = TITLE_SPACE > (title_len) ? TITLE_SPACE - (title_len) : 1;     \
+    while( ii-- ) mbedtls_printf( " " );                                \
     max_used -= prv_used;                                               \
     max_blocks -= prv_blocks;                                           \
     max_bytes = max_used + MEM_BLOCK_OVERHEAD * max_blocks;             \