Merging upstream version 1.70.0+dfsg2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 20 insertions, 0 deletions

diff --git a/vendor/nix/test/test_ptymaster_drop.rs b/vendor/nix/test/test_ptymaster_drop.rs
new file mode 100644
index 000000000..ffbaa5697
--- /dev/null
+++ b/vendor/nix/test/test_ptymaster_drop.rs
@@ -0,0 +1,20 @@
+#[cfg(not(any(target_os = "redox", target_os = "fuchsia")))]
+mod t {
+    use nix::fcntl::OFlag;
+    use nix::pty::*;
+    use nix::unistd::close;
+    use std::os::unix::io::AsRawFd;
+
+    /// Regression test for Issue #659
+    ///
+    /// `PtyMaster` should panic rather than double close the file descriptor
+    /// This must run in its own test process because it deliberately creates a
+    /// race condition.
+    #[test]
+    #[should_panic(expected = "Closing an invalid file descriptor!")]
+    fn test_double_close() {
+        let m = posix_openpt(OFlag::O_RDWR).unwrap();
+        close(m.as_raw_fd()).unwrap();
+        drop(m); // should panic here
+    }
+}