mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-10 12:40:58 +02:00
Code Releases Activity

44864: Avoid inifinite loop in tty init.

Browse source 
If we can't grab the terminal in interactive mode, give
up after 100 goes.  This is a completely arbitrary choice;
we simply don't know what in the system could change the
result of looping further.
This commit is contained in:
Peter Stephenson 2019-10-28 11:56:19 +00:00
parent 5be28dac5d
commit 8c25d92e11
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2019-10-28 Peter Stephenson <p.stephenson@samsung.com> 2019-10-28 Peter Stephenson <p.stephenson@samsung.com>
* 44864: Src/jobs.c: Avoid infinite loop in interactive mode
when trying to grab terminal. Fail after 100 goes (arbitrary
choice).
* Sebastian: 44865: configure.ac: Try harder to link in curses * Sebastian: 44865: configure.ac: Try harder to link in curses
even if not needed for termcap variables. even if not needed for termcap variables.

18
Src/jobs.c
View file

@ -2933,6 +2933,7 @@ acquire_pgrp(void)
sigaddset(&blockset, SIGTTOU); sigaddset(&blockset, SIGTTOU);
sigaddset(&blockset, SIGTSTP); sigaddset(&blockset, SIGTSTP);
oldset = signal_block(blockset); oldset = signal_block(blockset);
int loop_count = 0;
while ((ttpgrp = gettygrp()) != -1 && ttpgrp != mypgrp) { while ((ttpgrp = gettygrp()) != -1 && ttpgrp != mypgrp) {
mypgrp = GETPGRP(); mypgrp = GETPGRP();
if (mypgrp == mypid) { if (mypgrp == mypid) {
@ -2948,8 +2949,21 @@ acquire_pgrp(void)
if (read(0, NULL, 0) != 0) {} /* Might generate SIGT* */ if (read(0, NULL, 0) != 0) {} /* Might generate SIGT* */
signal_block(blockset); signal_block(blockset);
mypgrp = GETPGRP(); mypgrp = GETPGRP();
if (mypgrp == lastpgrp && !interact) if (mypgrp == lastpgrp) {
break; /* Unlikely that pgrp will ever change */ if (!interact)
break; /* Unlikely that pgrp will ever change */
if (++loop_count == 100)
{
/*
* It's time to give up. The count is arbitrary;
* this is just to fix up unusual cases, so it's
* left large in an attempt not to break normal
* cases where there's some delay in the system
* setting up the terminal.
*/
break;
}
}
lastpgrp = mypgrp; lastpgrp = mypgrp;
} }
if (mypgrp != mypid) { if (mypgrp != mypid) {