[hackers] [st] Avoid recursive call to ttywrite from ttyread || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Sat, 21 Nov 2015 18:23:59 +0100 (CET)

commit 375b28720f7c78e6fac1c274f9dee7c40a78aacb
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Sat Nov 21 18:21:03 2015 +0100
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Sat Nov 21 18:21:03 2015 +0100

    Avoid recursive call to ttywrite from ttyread
    
    Ttyread() calls to ttywrite, so if we check for reading before
    that for writing in ttywrite we can get a circular call sequence.

diff --git a/st.c b/st.c
index a47f094..c5d62c1 100644
--- a/st.c
+++ b/st.c
_AT_@ -1518,8 +1518,6 @@ ttywrite(const char *s, size_t n)
                                 continue;
                         die("select failed: %s\n", strerror(errno));
                 }
- if (FD_ISSET(cmdfd, &rfd))
- lim = ttyread();
                 if (FD_ISSET(cmdfd, &wfd)) {
                         /*
                          * Only write the bytes written by ttywrite() or the
_AT_@ -1543,6 +1541,8 @@ ttywrite(const char *s, size_t n)
                                 break;
                         }
                 }
+ if (FD_ISSET(cmdfd, &rfd))
+ lim = ttyread();
         }
         return;
 
Received on Sat Nov 21 2015 - 18:23:59 CET