Merge pull request rust-lang#282 from alexcrichton/fix-deadlock

Check for channel close after a park
withoutboats · Dec 8, 2016 · b22e86c · b22e86c
2 parents f2a3809 + 5f53404
commit b22e86c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/sync/mpsc/mod.rs b/src/sync/mpsc/mod.rs
@@ -413,12 +413,16 @@ impl<T> Sender<T> {
             None
         };
 
-        self.maybe_parked = true;
         *self.sender_task.lock().unwrap() = task;
 
         // Send handle over queue
         let t = self.sender_task.clone();
         self.inner.parked_queue.push(t);
+
+        // Check to make sure we weren't closed after we sent our task on the
+        // queue
+        let state = decode_state(self.inner.state.load(SeqCst));
+        self.maybe_parked = state.is_open;
     }
 
     fn poll_unparked(&mut self) -> Async<()> {