embedded: prevent double-close of pty fd

epilys · epilys · commit 35f12b155188 · 2024-08-06T18:15:11.000+03:00
Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/meli/src/terminal/embedded.rs b/meli/src/terminal/embedded.rs
@@ -23,6 +23,7 @@
 use std::os::fd::OwnedFd;
 use std::{
     ffi::{CString, OsStr},
+    mem::ManuallyDrop,
     os::unix::{
         ffi::OsStrExt,
         io::{AsRawFd, FromRawFd, IntoRawFd},
@@ -178,7 +179,8 @@ pub fn create_pty(width: usize, height: usize, command: &str) -> Result<Arc<Mute
     };
 
     let stdin = unsafe { std::fs::File::from_raw_fd(frontend_fd.as_raw_fd()) };
-    let mut embedded_pty = Terminal::new(stdin, child_pid);
+    // We will let the spawned thread close frontend_fd
+    let mut embedded_pty = Terminal::new(ManuallyDrop::new(stdin), child_pid);
     embedded_pty.set_terminal_size((width, height));
     let pty = Arc::new(Mutex::new(embedded_pty));
     let pty_ = pty.clone();
diff --git a/meli/src/terminal/embedded/terminal.rs b/meli/src/terminal/embedded/terminal.rs
@@ -70,7 +70,7 @@ enum CodepointBuf {
 #[derive(Debug)]
 pub struct Terminal {
     pub grid: EmbeddedGrid,
-    stdin: std::fs::File,
+    stdin: std::mem::ManuallyDrop<std::fs::File>,
     /// Pid of the embedded process
     pub child_pid: nix::unistd::Pid,
 }
@@ -114,7 +114,7 @@ impl std::io::Write for Terminal {
 }
 
 impl Terminal {
-    pub fn new(stdin: std::fs::File, child_pid: nix::unistd::Pid) -> Self {
+    pub fn new(stdin: std::mem::ManuallyDrop<std::fs::File>, child_pid: nix::unistd::Pid) -> Self {
         Self {
             grid: EmbeddedGrid::new(),
             stdin,
