Fix a race in the construction of future. This fixes http://llvm.org/bugs/show_bug.cgi?id=14934.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@172456 91177308-0d34-0410-b5e6-96231b3b80d8
2013-01-14 20:01:24 +00:00
parent 3e3ae9ec41
commit 1b031c947f
2 changed files with 6 additions and 2 deletions
--- a/include/future
+++ b/include/future
@@ -470,7 +470,11 @@ public:
        {return (__state_ & __constructed) || (__exception_ != nullptr);}

    _LIBCPP_INLINE_VISIBILITY
-    void __set_future_attached() {__state_ |= __future_attached;}
+    void __set_future_attached()
+    {
+        lock_guard<mutex> __lk(__mut_);
+        __state_ |= __future_attached;
+    }
    _LIBCPP_INLINE_VISIBILITY
    bool __has_future_attached() const {return __state_ & __future_attached;}