Don't set pointer if add_lock_callback used.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 19 Jun 2001 00:04:57 +0000 (00:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 19 Jun 2001 00:04:57 +0000 (00:04 +0000)
CHANGES
crypto/cryptlib.c

diff --git a/CHANGES b/CHANGES
index e8ffbf7..cf79a8e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
          *) 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]
index e9c9b3b..b733aba 100644 (file)
@@ -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
                {