aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2001-11-23 20:57:59 +0000
committerBodo Möller <bodo@openssl.org>2001-11-23 20:57:59 +0000
commitf717e5460f0a769ce1e77dd7afdab9277c7d0b05 (patch)
tree22d9d73e1537b80c49c5cc5b03e065462c0168f1
parent65129e1d576e3aa81618fa00503e4d23fe2e9e9a (diff)
downloadopenssl-f717e5460f0a769ce1e77dd7afdab9277c7d0b05.tar.gz
fix submitted by Andy Schneider <andy.schneider@bjss.co.uk>
-rw-r--r--CHANGES8
-rw-r--r--crypto/cryptlib.c3
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a66bf6141d..7f70743ec4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,14 @@
Changes between 0.9.6b and 0.9.6c [XX xxx XXXX]
+ *) Release CRYPTO_LOCK_DYNLOCK when CRYPTO_destroy_dynlockid()
+ returns early because it has nothing to do.
+ [Andy Schneider <andy.schneider@bjss.co.uk>]
+
+ *) [In 0.9.6c-engine release:]
+ Fix mutex callback return values in crypto/engine/hw_ncipher.c.
+ [Andy Schneider <andy.schneider@bjss.co.uk>]
+
*) Add a configuration entry for OS/390 Unix. The C compiler 'c89'
is called via tools/c89.sh because arguments have to be
rearranged (all '-L' options must appear before the first object
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index a98bf89e1b..8fd2d4d26b 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -228,7 +228,10 @@ void CRYPTO_destroy_dynlockid(int i)
CRYPTO_w_lock(CRYPTO_LOCK_DYNLOCK);
if (dyn_locks == NULL || i >= sk_CRYPTO_dynlock_num(dyn_locks))
+ {
+ CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);
return;
+ }
pointer = sk_CRYPTO_dynlock_value(dyn_locks, i);
if (pointer != NULL)
{