[PATCH] Cygwin: pty: Fix crash on master close in Windows 7.
Takashi Yano
takashi.yano@nifty.ne.jp
Wed Mar 30 03:56:57 GMT 2022
- 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
---
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
--
2.35.1
More information about the Cygwin-patches
mailing list