[newlib-cygwin] Cygwin: pty: Fix crash on master close in Windows 7.

Takashi Yano tyan0@sourceware.org
Wed Mar 30 03:57:44 GMT 2022


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

commit 49a00a0673e7318f7f27719ab2f0ac8eb3c6b439
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date:   Wed Mar 30 12:46:08 2022 +0900

    Cygwin: pty: Fix crash on master close in Windows 7.
    
    - The 4th parameter of WriteFile() cannot be NULL especially in
      Windows 7 as mentioned in Microsoft documentation. This patch
      fixes that.
    
    Addresses: https://cygwin.com/pipermail/cygwin/2022-March/251162.html

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 2 +-
 winsup/cygwin/release/3.3.5   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index e29b93ceb..4cb5f1411 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2106,7 +2106,7 @@ fhandler_pty_master::close ()
 	    }
 	  release_output_mutex ();
 	  get_ttyp ()->stop_fwd_thread = true;
-	  WriteFile (to_master_nat, "", 0, NULL, NULL);
+	  WriteFile (to_master_nat, "", 0, &len, NULL);
 	  master_fwd_thread->detach ();
 	}
     }
diff --git a/winsup/cygwin/release/3.3.5 b/winsup/cygwin/release/3.3.5
index d2a7f772a..9d44c1b79 100644
--- a/winsup/cygwin/release/3.3.5
+++ b/winsup/cygwin/release/3.3.5
@@ -43,3 +43,6 @@ Bug Fixes
 
 - Fix a formatting problem in gmondump where all displayed addresses are
   mistakenly prefixed with "0x0x".
+
+- Fix crash on pty master close in Windows 7.
+  Addresses: https://cygwin.com/pipermail/cygwin/2022-March/251162.html


More information about the Cygwin-cvs mailing list