Don't set pointer if add_lock_callback used.

diff --git a/CHANGES b/CHANGES
index e8ffbf700c7ff911408bc103fc41906be21e28c9..cf79a8ea10d205dfb314b379f061c3282d24fd12 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,11 @@
          *) applies to 0.9.6a (/0.9.6b) and 0.9.7
          +) applies to 0.9.7 only
 
+  *) 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 <Paul.Rose@bridge.com>]
+
   *) 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 e9c9b3b5a226e9572151c1f5973ac7d8d22f3e62..b733abafeeea944b9cdb0c99f742a37e6070be4d 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -431,7 +431,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
                {