Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 13:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

handle ttyname returning NULL

Browse source 
If the tty has been closed (i.e., become invalid) the `ttyname()`
function will return NULL. Passing that NULL to `strstr()` can crash
fish which means it won't kill its child processes and exit cleanly.

Another fix for #3644
This commit is contained in:
Kurtis Rader 2017-01-09 16:03:19 -08:00
parent 4bed9ea56d
commit e9de674bbd
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/reader.cpp
View file

@ -660,34 +660,38 @@ bool reader_thread_job_is_stale() {
return (void *)(uintptr_t)s_generation_count != pthread_getspecific(generation_count_key); return (void *)(uintptr_t)s_generation_count != pthread_getspecific(generation_count_key);
} }
void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
const env_var_t term_str = env_get_string(L"TERM");
// This is a pretty lame heuristic for detecting terminals that do not support setting the /// This is a pretty lame heuristic for detecting terminals that do not support setting the
// title. If we recognise the terminal name as that of a virtual terminal, we assume it supports /// title. If we recognise the terminal name as that of a virtual terminal, we assume it supports
// setting the title. If we recognise it as that of a console, we assume it does not support /// setting the title. If we recognise it as that of a console, we assume it does not support
// setting the title. Otherwise we check the ttyname and see if we believe it is a virtual /// setting the title. Otherwise we check the ttyname and see if we believe it is a virtual
// terminal. /// terminal.
// ///
// One situation in which this breaks down is with screen, since screen supports setting the /// One situation in which this breaks down is with screen, since screen supports setting the
// terminal title if the underlying terminal does so, but will print garbage on terminals that /// terminal title if the underlying terminal does so, but will print garbage on terminals that
// don't. Since we can't see the underlying terminal below screen there is no way to fix this. /// don't. Since we can't see the underlying terminal below screen there is no way to fix this.
if (term_str.missing()) return; static bool term_supports_setting_title() {
const env_var_t term_str = env_get_string(L"TERM");
if (term_str.missing()) return false;
const wchar_t *term = term_str.c_str(); const wchar_t *term = term_str.c_str();
bool recognized = contains(term, L"xterm", L"screen", L"tmux", L"nxterm", L"rxvt"); bool recognized = contains(term, L"xterm", L"screen", L"tmux", L"nxterm", L"rxvt");
recognized = recognized || !wcsncmp(term, L"xterm-", wcslen(L"xterm-")); if (!recognized) recognized = !wcsncmp(term, L"xterm-", wcslen(L"xterm-"));
recognized = recognized || !wcsncmp(term, L"screen-", wcslen(L"screen-")); if (!recognized) recognized = !wcsncmp(term, L"screen-", wcslen(L"screen-"));
recognized = recognized || !wcsncmp(term, L"tmux-", wcslen(L"tmux-")); if (!recognized) recognized = !wcsncmp(term, L"tmux-", wcslen(L"tmux-"));
if (!recognized) { if (!recognized) {
char *n = ttyname(STDIN_FILENO); if (contains(term, L"linux", L"dumb")) return false;
if (contains(term, L"linux")) return; char *n = ttyname(STDIN_FILENO);
if (contains(term, L"dumb")) return; if (!n || strstr(n, "tty") || strstr(n, "/vc/")) return false;
if (strstr(n, "tty") || strstr(n, "/vc/")) return;
} }
return true;
}
void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
if (!term_supports_setting_title()) return;
wcstring fish_title_command = DEFAULT_TITLE; wcstring fish_title_command = DEFAULT_TITLE;
if (function_exists(L"fish_title")) { if (function_exists(L"fish_title")) {
fish_title_command = L"fish_title"; fish_title_command = L"fish_title";
@ -698,7 +702,6 @@ void reader_write_title(const wcstring &cmd, bool reset_cursor_position) {
} }
wcstring_list_t lst; wcstring_list_t lst;
proc_push_interactive(0); proc_push_interactive(0);
if (exec_subshell(fish_title_command, lst, false /* ignore exit status */) != -1 && if (exec_subshell(fish_title_command, lst, false /* ignore exit status */) != -1 &&
!lst.empty()) { !lst.empty()) {