From 1b822decb85ae7131e5687255ae59db34b57afaf Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 19 Jun 2001 00:09:20 +0000 Subject: [PATCH] Don't set *pointer if add_lock_callback used. --- CHANGES | 5 +++++ crypto/cryptlib.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2d5f6b8622..7b324389b8 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,11 @@ Changes between 0.9.6a and 0.9.6b [XX xxx XXXX] + *) Don't change *pointer in CRYPTO_add_lock() is add_lock_callback is + used: it isn't thread safe and the add_lock_callback should handle + that itself. + [Paul Rose ] + *) Verify that incoming data obeys the block size in ssl3_enc (ssl/s3_enc.c) and tls1_enc (ssl/t1_enc.c). [Bodo Moeller] diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index c99851810f..fdb416d598 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -430,7 +430,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, CRYPTO_get_lock_name(type), file,line); #endif - *pointer=ret; } else { -- 2.25.1