leak-detective: Make sure to actually call malloc() from calloc() hook

Newer versions of GCC are too "smart" and replace a call to malloc(X)
followed by a call to memset(0,X) with a call co calloc(), which obviously
results in an infinite loop when it does that in our own calloc()
implementation.  Using `volatile` for the variable storing the total size
prevents the optimization and we actually call malloc().

diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c
index 1543c7f99952e2f8410c3574925aac206f70fc52..a0bdae7155ffe6e2077dc1165280e807c5c61a31 100644 (file)
--- a/src/libstrongswan/utils/leak_detective.c
+++ b/src/libstrongswan/utils/leak_detective.c
@@ -810,10 +810,11 @@ HOOK(void*, malloc, size_t bytes)
 HOOK(void*, calloc, size_t nmemb, size_t size)
 {
        void *ptr;
+       volatile size_t total;
 
-       size *= nmemb;
-       ptr = malloc(size);
-       memset(ptr, 0, size);
+       total = nmemb * size;
+       ptr = malloc(total);
+       memset(ptr, 0, total);
 
        return ptr;
 }