From b9b6e14b4aa61a97d0a459968733cf3d6f9e1e23 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 11 Dec 2002 08:56:35 +0000 Subject: In CRYPTO_lock(), check that the application cares about locking (provided callbacks) before attempting to lock. --- crypto/cryptlib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 830ccc9816..fb3e93fe27 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -472,17 +472,17 @@ void CRYPTO_lock(int mode, int type, const char *file, int line) #endif if (type < 0) { - struct CRYPTO_dynlock_value *pointer - = CRYPTO_get_dynlock_value(type); + if (dynlock_lock_callback != NULL) + { + struct CRYPTO_dynlock_value *pointer + = CRYPTO_get_dynlock_value(type); - OPENSSL_assert(pointer != NULL); + OPENSSL_assert(pointer != NULL); - if (dynlock_lock_callback) - { dynlock_lock_callback(mode, pointer, file, line); - } - CRYPTO_destroy_dynlockid(type); + CRYPTO_destroy_dynlockid(type); + } } else if (locking_callback != NULL) -- cgit v1.2.3