projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
X509: add more error codes on malloc or sk_TYP_push failure
[openssl.git]
/
crypto
/
threads_win.c
diff --git
a/crypto/threads_win.c
b/crypto/threads_win.c
index 6f9c7b1bd398cb08ea791b2047d13bc135d34fb2..1e5cf82073e0787dddb88956882a9a62747dec12 100644
(file)
--- a/
crypto/threads_win.c
+++ b/
crypto/threads_win.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
@@
-17,9
+17,12
@@
CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
{
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;
return NULL;
+ }
/* 0x400 is the spin count value suggested in the documentation */
if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
/* 0x400 is the spin count value suggested in the documentation */
if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
@@
-135,7
+138,13
@@
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
{
int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
{
- InterlockedCompareExchange(val, 0, 0);
+ *ret = InterlockedCompareExchange(val, 0, 0);
+ return 1;
+}
+
+int CRYPTO_atomic_write(int *val, int n, CRYPTO_RWLOCK *lock)
+{
+ InterlockedExchange(val, n);
return 1;
}
return 1;
}