wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix datarace reported by valgrind/helgrind

Browse source 
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: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Russell Coker 2009-06-25 15:59:32 +10:00 committed by Kurt Roeckx
parent 25012d5e79
commit e298409c34
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crypto/mem.c
View file

@ -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);