Fix deadlock in condition_variable_any with stop_token (#2220)

Co-authored-by: Stephan T. Lavavej <[email protected]>
microsoft · Oct 20, 2021 · 066c172 · 066c172
1 parent bb210e7
commit 066c172
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/stl/inc/condition_variable b/stl/inc/condition_variable
@@ -212,6 +212,8 @@ public:
             }
 
             _Unlock_guard<_Lock> _Unlock_outer{_Lck};
+            unique_lock<mutex> _Guard_unlocks_before_locking_outer{_STD move(_Guard)};
+
             const auto _Now = _Clock::now();
             if (_Now >= _Abs_time) {
                 break;
@@ -223,7 +225,7 @@ public:
             _CSTD xtime _Tgt;
             (void) _To_xtime_10_day_clamped(_Tgt, _Rel_time);
             const int _Res = _Cnd_timedwait(_Mycnd(), _Myptr->_Mymtx(), &_Tgt);
-            _Guard.unlock();
+            _Guard_unlocks_before_locking_outer.unlock();
 
             switch (_Res) {
             case _Thrd_timedout: