More specific assertion for unlocking mutex not owned by the current thread (#5099)

AlexGuteniev · web-flow · commit 9b8a09afdd1c · 2024-11-22T13:24:29.000-08:00
diff --git a/stl/src/mutex.cpp b/stl/src/mutex.cpp
@@ -147,8 +147,9 @@ static _Thrd_result mtx_do_lock(_Mtx_t mtx, const _timespec64* target) noexcept
 }
 
 _CRTIMP2_PURE _Thrd_result __cdecl _Mtx_unlock(_Mtx_t mtx) noexcept { // unlock mutex
+    _THREAD_ASSERT(mtx->_Count > 0, "unlock of unowned mutex");
     _THREAD_ASSERT(
-        1 <= mtx->_Count && mtx->_Thread_id == static_cast<long>(GetCurrentThreadId()), "unlock of unowned mutex");
+        mtx->_Thread_id == static_cast<long>(GetCurrentThreadId()), "unlock of mutex not owned by the current thread");
 
     if (--mtx->_Count == 0) { // leave critical section
         mtx->_Thread_id = -1;

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,9 @@ static _Thrd_result mtx_do_lock(_Mtx_t mtx, const _timespec64* target) noexcept`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`_CRTIMP2_PURE _Thrd_result __cdecl _Mtx_unlock(_Mtx_t mtx) noexcept { // unlock mutex`
	`150`	`+ _THREAD_ASSERT(mtx->_Count > 0, "unlock of unowned mutex");`
`150`	`151`	`_THREAD_ASSERT(`
`151`		`- 1 <= mtx->_Count && mtx->_Thread_id == static_cast<long>(GetCurrentThreadId()), "unlock of unowned mutex");`
	`152`	`+ mtx->_Thread_id == static_cast<long>(GetCurrentThreadId()), "unlock of mutex not owned by the current thread");`
`152`	`153`
`153`	`154`	`if (--mtx->_Count == 0) { // leave critical section`
`154`	`155`	`mtx->_Thread_id = -1;`