X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fmem_dbg.c;h=703cc30c78e7ec75ab96234b8034d298d14d8c55;hb=cc8926ec8fcecae89ceab91ef753de93e49568f9;hp=b394de87ab8248b93dac418943642223c96a7979;hpb=0e598a3d185e9bbfe1a513c05063970a1c532e23;p=openssl.git diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index b394de87ab..703cc30c78 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -1,7 +1,7 @@ /* - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html @@ -93,11 +93,10 @@ static CRYPTO_THREAD_ID disabling_threadid; DEFINE_RUN_ONCE_STATIC(do_memdbg_init) { - memdbg_lock = CRYPTO_THREAD_glock_new("malloc"); - long_memdbg_lock = CRYPTO_THREAD_glock_new("long_malloc"); - if (memdbg_lock == NULL - || long_memdbg_lock == NULL - || !CRYPTO_THREAD_init_local(&appinfokey, NULL)) { + memdbg_lock = CRYPTO_THREAD_lock_new(); + long_memdbg_lock = CRYPTO_THREAD_lock_new(); + if (memdbg_lock == NULL || long_memdbg_lock == NULL + || !CRYPTO_THREAD_init_local(&appinfokey, NULL)) { CRYPTO_THREAD_lock_free(memdbg_lock); memdbg_lock = NULL; CRYPTO_THREAD_lock_free(long_memdbg_lock);