projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More more on SM2 error codes and tidy up
[openssl.git]
/
crypto
/
threads_none.c
diff --git
a/crypto/threads_none.c
b/crypto/threads_none.c
index 30ed4e6999cc6c1fbae8fa35d682468e7ab5513f..ab6db8e36b988519e42bb3f74829b144c6cc405b 100644
(file)
--- a/
crypto/threads_none.c
+++ b/
crypto/threads_none.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016
-2018
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-14,9
+14,12
@@
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
- CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(unsigned int));
- if (lock == NULL)
+ CRYPTO_RWLOCK *lock;
+
+ if ((lock = OPENSSL_zalloc(sizeof(unsigned int))) == NULL) {
+ /* Don't set error, to avoid recursion blowup. */
return NULL;
return NULL;
+ }
*(unsigned int *)lock = 1;
*(unsigned int *)lock = 1;