Fix datarace reported by valgrind/helgrind

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 21c0011380830d647571a148707d16660d435354..01052cfa38e9a562a4301cce3bd6a36a9877d91a 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -121,10 +121,10 @@ static void (*set_debug_options_func)(long) = NULL;
 static long (*get_debug_options_func)(void) = NULL;
 #endif
 
-
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
        void (*f)(void *))
        {
+       /* Dummy call just to ensure OPENSSL_init() gets linked in */
        OPENSSL_init();
        if (!allow_customize)
                return 0;
@@ -255,10 +255,12 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
 
        if (num <= 0) return NULL;
 
-       allow_customize = 0;
+       if(allow_customize)
+               allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
-               allow_customize_debug = 0;
+               if(allow_customize_debug)
+                       allow_customize_debug = 0;
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_locked_ex_func(num,file,line);
@@ -299,10 +301,12 @@ void *CRYPTO_malloc(int num, const char *file, int line)
 
        if (num <= 0) return NULL;
 
-       allow_customize = 0;
+       if(allow_customize)
+               allow_customize = 0;
        if (malloc_debug_func != NULL)
                {
-               allow_customize_debug = 0;
+               if(allow_customize_debug)
+                       allow_customize_debug = 0;
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_ex_func(num,file,line);