From 7de2b9c4afd90359e47d81a5fa70bcb8506fbf91 Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@openssl.org>
Date: Thu, 5 Apr 2018 15:13:55 -0400
Subject: Set error code if alloc returns NULL

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5886)
---
 crypto/threads_win.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'crypto/threads_win.c')

diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index f222aa5d03..ad4f5e151b 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -17,9 +17,12 @@
 
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
-    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(CRITICAL_SECTION));
-    if (lock == NULL)
+    CRYPTO_RWLOCK *lock;
+
+    if ((lock = OPENSSL_zalloc(sizeof(CRITICAL_SECTION))) == NULL) {
+        /* Don't set error, to avoid recursion blowup. */
         return NULL;
+    }
 
     /* 0x400 is the spin count value suggested in the documentation */
     if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
-- 
cgit v1.2.3