From 712419b73ae6c48f6ad9ce1020a2fd3f52b9bb00 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 11 Dec 2002 08:56:42 +0000 Subject: [PATCH] In CRYPTO_lock(), check that the application cares about locking (provided callbacks) before attempting to lock. --- crypto/cryptlib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 6eb7a5cba..b7fec9049 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -410,17 +410,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); - - OPENSSL_assert(pointer != NULL); - - if (dynlock_lock_callback) + if (dynlock_lock_callback != NULL) { - dynlock_lock_callback(mode, pointer, file, line); - } + struct CRYPTO_dynlock_value *pointer + = CRYPTO_get_dynlock_value(type); - CRYPTO_destroy_dynlockid(type); + OPENSSL_assert(pointer != NULL); + + dynlock_lock_callback(mode, pointer, file, line); + + CRYPTO_destroy_dynlockid(type); + } } else if (locking_callback != NULL)