Commit f8ae6032 authored by Russell Coker's avatar Russell Coker Committed by Kurt Roeckx
Browse files

Fix datarace reported by valgrind/helgrind 

This doesn't really fix the datarace but changes it so it can only happens
once. This isn't really a problem since we always just set it to the same
value. We now just stop writing it after the first time.

PR3584, https://bugs.debian.org/534534



Signed-off-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent bfc973f4

crypto/mem.c

+8 −4
Original line number Diff line number Diff line
@@ -254,9 +254,11 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line) 


	if (num <= 0) return NULL;



	if(allow_customize)

		allow_customize = 0;

	if (malloc_debug_func != NULL)

		{

		if(allow_customize_debug)

			allow_customize_debug = 0;

		malloc_debug_func(NULL, num, file, line, 0);

		}
@@ -298,9 +300,11 @@ void *CRYPTO_malloc(int num, const char *file, int line) 


	if (num <= 0) return NULL;



	if(allow_customize)

		allow_customize = 0;

	if (malloc_debug_func != NULL)

		{

		if(allow_customize_debug)

			allow_customize_debug = 0;

		malloc_debug_func(NULL, num, file, line, 0);

		}