diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-08-29 21:24:17 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-09-01 01:42:03 +0200 |
| commit | ed6b2c7938ec6f07b15745d4183afc276e74c6dd (patch) | |
| tree | ae11f0bb2f38642aceb8174e7b64e2815316250b /crypto/mem_dbg.c | |
| parent | Fix potential null problem. (diff) | |
| download | openssl-ed6b2c7938ec6f07b15745d4183afc276e74c6dd.tar.xz openssl-ed6b2c7938ec6f07b15745d4183afc276e74c6dd.zip | |
Add CRYPTO_thread_glock_new
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4294)
Diffstat (limited to 'crypto/mem_dbg.c')
| -rw-r--r-- | crypto/mem_dbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 70b5e62ab5..9228dcef13 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -90,8 +90,8 @@ static CRYPTO_THREAD_ID disabling_threadid; DEFINE_RUN_ONCE_STATIC(do_memdbg_init) { - malloc_lock = CRYPTO_THREAD_lock_new(); - long_malloc_lock = CRYPTO_THREAD_lock_new(); + malloc_lock = CRYPTO_THREAD_glock_new("malloc"); + long_malloc_lock = CRYPTO_THREAD_glock_new("long_malloc"); if (malloc_lock == NULL || long_malloc_lock == NULL || !CRYPTO_THREAD_init_local(&appinfokey, NULL)) { CRYPTO_THREAD_lock_free(malloc_lock); |