X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fthreads_none.c;h=4b1940ae44dbd63a50df824a5d876633a2786796;hb=930e031052220776d41bcc20a72d0f276127fb74;hp=7e9ec2d15148eb9636fe0e899120fce653afa600;hpb=94683b7acb62a5d99b8b4d66283e6d6dd0007f7a;p=oweals%2Fopenssl.git

diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 7e9ec2d151..4b1940ae44 100644
--- 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
@@ -14,9 +14,12 @@
 
 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;
+    }
 
     *(unsigned int *)lock = 1;
 
@@ -125,12 +128,6 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
     return 1;
 }
 
-int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
-{
-    *ret  = *val;
-    return 1;
-}
-
 int openssl_init_fork_handlers(void)
 {
     return 0;