Return a value from atomic read on Windows.

Use a read lock when reading using pthreads.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4517)

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 34be314f1fd7cbb4bcff27c1cc4d85c0034ca1a4..3aeef21668b93aaa4fa830cf8a8f0863a720032d 100644 (file)
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -177,7 +177,7 @@ int CRYPTO_atomic_read(int *val, int *ret, CRYPTO_RWLOCK *lock)
         return 1;
     }
 # endif
-    if (!CRYPTO_THREAD_write_lock(lock))
+    if (!CRYPTO_THREAD_read_lock(lock))
         return 0;
 
     *ret  = *val;

diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index ab2eb2574025747aef1dff27b4f62fed6b13d173..f222aa5d03c00f6f09e07bfa9bc334ec6686d31d 100644 (file)
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -135,7 +135,7 @@ int CRYPTO_atomic_add(int *val, int amount, 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;
 }