* [PATCH] Cygwin: pty: Fix a bug in the code removing set window title sequence.
@ 2020-08-31 12:02 Takashi Yano
2020-08-31 14:48 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2020-08-31 12:02 UTC (permalink / raw)
To: cygwin-patches
- Commit 4e08fe42c9f3fdba63a57a8e3a6d705c4e10f50f has a bug which
may cause infinite loop in pty_master_fwd_thread(). This patch
fixes the issue.
---
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 */
--
2.28.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: pty: Fix a bug in the code removing set window title sequence.
2020-08-31 12:02 [PATCH] Cygwin: pty: Fix a bug in the code removing set window title sequence Takashi Yano
@ 2020-08-31 14:48 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2020-08-31 14:48 UTC (permalink / raw)
To: cygwin-patches
On Aug 31 21:02, Takashi Yano via Cygwin-patches wrote:
> - Commit 4e08fe42c9f3fdba63a57a8e3a6d705c4e10f50f has a bug which
> may cause infinite loop in pty_master_fwd_thread(). This patch
> fixes the issue.
> ---
> 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 */
> --
> 2.28.0
Pushed.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-31 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-31 12:02 [PATCH] Cygwin: pty: Fix a bug in the code removing set window title sequence Takashi Yano
2020-08-31 14:48 ` Corinna Vinschen
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).