public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
* [PATCH] Cygwin: pty: Fix segfault caused when tcflush() is called.
@ 2021-02-20 22:45 Takashi Yano
  2021-02-22  9:51 ` Corinna Vinschen
  0 siblings, 1 reply; 10+ messages in thread
From: Takashi Yano @ 2021-02-20 22:45 UTC (permalink / raw)
  To: cygwin-patches

- After commit 253352e796ff9ec9a447e5375f5bc3e2b92b5293, mc (midnight
  commander) crashes with segfault if the shell is bash. This is due
  to NULL pointer access in read(). This patch fixes the issue.
  Addresses::
    https://cygwin.com/pipermail/cygwin/2021-February/247870.html
---
 winsup/cygwin/fhandler_tty.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index d30041af1..3fcaa8277 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1474,8 +1474,11 @@ wait_retry:
 out:
   termios_printf ("%d = read(%p, %lu)", totalread, ptr, len);
   len = (size_t) totalread;
-  bool saw_eol = totalread > 0 && strchr ("\r\n", ptr0[totalread -1]);
-  mask_switch_to_pcon_in (false, saw_eol);
+  if (ptr0)
+    { /* Not tcflush() */
+      bool saw_eol = totalread > 0 && strchr ("\r\n", ptr0[totalread -1]);
+      mask_switch_to_pcon_in (false, saw_eol);
+    }
 }
 
 int
-- 
2.30.0


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-02-23 17:15 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 22:45 [PATCH] Cygwin: pty: Fix segfault caused when tcflush() is called Takashi Yano
2021-02-22  9:51 ` Corinna Vinschen
2021-02-22 11:41   ` Takashi Yano
2021-02-22 13:28     ` Takashi Yano
2021-02-22 13:57       ` Corinna Vinschen
2021-02-22 13:57     ` Corinna Vinschen
2021-02-23 11:24       ` Thomas Wolff
2021-02-23 13:13         ` Takashi Yano
2021-02-23 13:33           ` Takashi Yano
2021-02-23 17:15             ` Thomas Wolff

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).