[newlib-cygwin/cygwin-3_5-branch] Cygwin: pty: Fix handle leak in master process.

Takashi Yano tyan0@sourceware.org
Tue Feb 13 14:37:44 GMT 2024


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a6ac7b413891b9fa4fce58bb1fb4729798b7c8a1

commit a6ac7b413891b9fa4fce58bb1fb4729798b7c8a1
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Tue Feb 13 11:17:46 2024 +0900

    Cygwin: pty: Fix handle leak in master process.
    
    If non-cygwin process is started in pty, closing from_master_nat
    pipe handle was missing in fhandler_pty_slave::input_transfer().
    This occured because the handle was duplicated but not closed.
    
    https://github.com/msys2/msys2-runtime/issues/198
    
    Fixes: 29431fcb5b14 ("Cygwin: pty: Inherit typeahead data between two input pipes.")
    Reported-by: Hakkin Lain
    Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>

Diff:
---
 winsup/cygwin/fhandler/pty.cc | 1 +
 winsup/cygwin/release/3.5.1   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/winsup/cygwin/fhandler/pty.cc b/winsup/cygwin/fhandler/pty.cc
index 3f4bc56b5..c5c792144 100644
--- a/winsup/cygwin/fhandler/pty.cc
+++ b/winsup/cygwin/fhandler/pty.cc
@@ -3995,6 +3995,7 @@ fhandler_pty_slave::transfer_input (tty::xfer_dir dir, HANDLE from, tty *ttyp,
 	    transfered = true;;
 	}
     }
+  CloseHandle (to);
 
   /* Fix input_available_event which indicates availability in cyg pipe. */
   if (dir == tty::to_nat) /* all data is transfered to nat pipe,
diff --git a/winsup/cygwin/release/3.5.1 b/winsup/cygwin/release/3.5.1
index 81945dbda..715fcf74d 100644
--- a/winsup/cygwin/release/3.5.1
+++ b/winsup/cygwin/release/3.5.1
@@ -12,3 +12,7 @@ Fixes:
   error mode is now possible by using the new CYGWIN environment variable
   option "winjitdebug".
   Addresses: https://cygwin.com/pipermail/cygwin/2024-February/255305.html
+
+- Fix handle leak in pty master which occurs when non-cygwin process
+  is started in pty.
+  Addresses: https://github.com/msys2/msys2-runtime/issues/198


More information about the Cygwin-cvs mailing list