public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pty: Fix segfault caused when tcflush() is called.
Date: Mon, 22 Feb 2021 09:50:38 +0000 (GMT)	[thread overview]
Message-ID: <20210222095038.A413D3890418@sourceware.org> (raw)

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

commit 18b91fbe580e747edf0f7ef8edbec4df07bc7245
Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>
Date:   Sun Feb 21 07:45:16 2021 +0900

    Cygwin: pty: Fix segfault caused when tcflush() is called.
    
    - 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

Diff:
---
 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


                 reply	other threads:[~2021-02-22  9:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210222095038.A413D3890418@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).