Another thread-safety fix

This commit is contained in:
Bodo Möller 2006-06-16 01:01:14 +00:00
parent 0e73294e26
commit 4a9cfd763e

View File

@ -407,6 +407,7 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
const BIGNUM *mod, BN_CTX *ctx) const BIGNUM *mod, BN_CTX *ctx)
{ {
int got_write_lock = 0; int got_write_lock = 0;
BN_MONT_CTX *ret;
CRYPTO_r_lock(lock); CRYPTO_r_lock(lock);
if (!*pmont) if (!*pmont)
@ -417,19 +418,20 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
if (!*pmont) if (!*pmont)
{ {
BN_MONT_CTX *mtmp; ret = BN_MONT_CTX_new();
mtmp = BN_MONT_CTX_new(); if (ret && !BN_MONT_CTX_set(ret, mod, ctx))
if (mtmp && !BN_MONT_CTX_set(mtmp, mod, ctx)) BN_MONT_CTX_free(ret);
BN_MONT_CTX_free(mtmp);
else else
*pmont = mtmp; *pmont = ret;
} }
} }
ret = *pmont;
if (got_write_lock) if (got_write_lock)
CRYPTO_w_unlock(lock); CRYPTO_w_unlock(lock);
else else
CRYPTO_r_unlock(lock); CRYPTO_r_unlock(lock);
return *pmont; return ret;
} }