Don't set *pointer if add_lock_callback used.

diff --git a/CHANGES b/CHANGES
index 2d5f6b862248a21d4631a141697ab1e3fdbc723d..7b324389b8e16386a069e226981d893ddaaadd5e 100644 (file)
--- 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 <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 c99851810fc548fcdebbc7ac0c6da317552d17fb..fdb416d5981ed72d48e302055eca7ba0377fdc19 100644 (file)
--- 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
                {