diff options
| -rw-r--r-- | crypto/mem_dbg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index ddb95fb549..f0838c8c63 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -229,8 +229,8 @@ int CRYPTO_mem_ctrl(int mode) break; case CRYPTO_MEM_CHECK_OFF: /* aka MemCheck_stop() */ mh_mode = 0; - num_disable = 0; /* should be true *before* MemCheck_stop is used, - or there'll be a lot of confusion */ + num_disable = 0; /* should be true *before* MemCheck_stop is + used, or there'll be a lot of confusion */ break; /* switch off temporarily (for library-internal use): */ @@ -239,7 +239,8 @@ int CRYPTO_mem_ctrl(int mode) { CRYPTO_THREADID cur; CRYPTO_THREADID_current(&cur); - if (!num_disable || CRYPTO_THREADID_cmp(&disabling_threadid, &cur)) /* otherwise we already have the MALLOC2 lock */ + /* see if we don't have the MALLOC2 lock already */ + if (!num_disable || CRYPTO_THREADID_cmp(&disabling_threadid, &cur)) { /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if |