From 1b2aa7959c86a835491c8cfca8c0683b747c1855 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 9 Oct 2006 16:29:05 +0000 Subject: Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d svn path=/openssl/vendor/current/CHANGES; revision=375 --- openssl/vendor/current/crypto/err/err.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'openssl/vendor/current/crypto/err') diff --git a/openssl/vendor/current/crypto/err/err.c b/openssl/vendor/current/crypto/err/err.c index 72e3f3a2..96bd255e 100644 --- a/openssl/vendor/current/crypto/err/err.c +++ b/openssl/vendor/current/crypto/err/err.c @@ -548,9 +548,20 @@ static void build_SYS_str_reasons(void) int i; static int init = 1; - if (!init) return; - + CRYPTO_r_lock(CRYPTO_LOCK_ERR); + if (!init) + { + CRYPTO_r_unlock(CRYPTO_LOCK_ERR); + return; + } + + CRYPTO_r_unlock(CRYPTO_LOCK_ERR); CRYPTO_w_lock(CRYPTO_LOCK_ERR); + if (!init) + { + CRYPTO_w_unlock(CRYPTO_LOCK_ERR); + return; + } for (i = 1; i <= NUM_SYS_STR_REASONS; i++) { -- cgit v1.2.3