diff options
| author | Rich Salz <rsalz@openssl.org> | 2018-04-05 15:13:55 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-04-05 15:13:55 -0400 |
| commit | 7de2b9c4afd90359e47d81a5fa70bcb8506fbf91 (patch) | |
| tree | 6dd747cfc308dcae60f4aaf7e8ba354073e8413b /crypto/threads_win.c | |
| parent | 77579510aa40aa769ceafc7a0c856381800e79c2 (diff) | |
| download | openssl-new-7de2b9c4afd90359e47d81a5fa70bcb8506fbf91.tar.gz | |
Set error code if alloc returns NULL
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5886)
Diffstat (limited to 'crypto/threads_win.c')
| -rw-r--r-- | crypto/threads_win.c | 7 |
1 files changed, 5 insertions, 2 deletions
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)) { |