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 a bug in the code removing set window title sequence.
Date: Mon, 31 Aug 2020 14:48:04 +0000 (GMT)	[thread overview]
Message-ID: <20200831144804.937BC3851C17@sourceware.org> (raw)

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

commit 6871c8418d102c8cfc6185757210d5c7f2dd4d46
Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>
Date:   Mon Aug 31 21:02:13 2020 +0900

    Cygwin: pty: Fix a bug in the code removing set window title sequence.
    
    - Commit 4e08fe42c9f3fdba63a57a8e3a6d705c4e10f50f has a bug which
      may cause infinite loop in pty_master_fwd_thread(). This patch
      fixes the issue.

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index e4e94f114..8bf39c3e6 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -2168,15 +2168,12 @@ fhandler_pty_master::pty_master_fwd_thread ()
 	      /* Remove Set title sequence */
 	      char *p0, *p1;
 	      p0 = outbuf;
-	      while ((p0 = (char *) memmem (p0, rlen, "\033]0;", 4)))
+	      while ((p0 = (char *) memmem (p0, rlen, "\033]0;", 4))
+		     && (p1 = (char *) memchr (p0, '\007', rlen-(p0-outbuf))))
 		{
-		  p1 = (char *) memchr (p0, '\007', rlen - (p0 - outbuf));
-		  if (p1)
-		    {
-		      memmove (p0, p1 + 1, rlen - (p1 + 1 - outbuf));
-		      rlen -= p1 + 1 - p0;
-		      wlen = rlen;
-		    }
+		  memmove (p0, p1 + 1, rlen - (p1 + 1 - outbuf));
+		  rlen -= p1 + 1 - p0;
+		  wlen = rlen;
 		}
 	    }
 	  /* Remove CSI > Pm m */


                 reply	other threads:[~2020-08-31 14:48 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=20200831144804.937BC3851C17@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).