From: native-api <ivan_pozdeev@mail.ru>
Date: Sat, 2 Feb 2019 16:22:55 +0000 (+0300)
Subject: bpo-33316: PyThread_release_lock always fails (GH-6541)
X-Git-Tag: v3.8.0a1~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05e922136a3286893bd489a8f2ecfa0dba4da368;p=thirdparty%2FPython%2Fcpython.git

bpo-33316: PyThread_release_lock always fails (GH-6541)

Use correct interpretation of return value from APIs.
---

diff --git a/Misc/NEWS.d/next/Windows/2018-04-20-03-24-07.bpo-33316.9IiJ8J.rst b/Misc/NEWS.d/next/Windows/2018-04-20-03-24-07.bpo-33316.9IiJ8J.rst
new file mode 100644
index 000000000000..55176791a901
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2018-04-20-03-24-07.bpo-33316.9IiJ8J.rst
@@ -0,0 +1 @@
+PyThread_release_lock always fails
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
index 21ef5556a6bc..fdb192b7d77a 100644
--- a/Python/thread_nt.h
+++ b/Python/thread_nt.h
@@ -104,8 +104,9 @@ LeaveNonRecursiveMutex(PNRMUTEX mutex)
     if (PyMUTEX_LOCK(&mutex->cs))
         return FALSE;
     mutex->locked = 0;
-    result = PyCOND_SIGNAL(&mutex->cv);
-    result &= PyMUTEX_UNLOCK(&mutex->cs);
+    /* condvar APIs return 0 on success. We need to return TRUE on success. */
+    result = !PyCOND_SIGNAL(&mutex->cv);
+    PyMUTEX_UNLOCK(&mutex->cs);
     return result;
 }