h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-25 18:31:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

Don't enqueue a repaint in the middle of one

Browse Source 
This can easily lead to an infinite loop, if a variable handler
triggers a repaint and the variable is set in the prompt, e.g. some of
the git variables.

A simple way to reproduce:

    function fish_mode_prompt
        commandline -f repaint
    end

Repainting executes the mode prompt, which triggers a repaint, which
triggers the mode prompt, ....

So we just set a flag and check it.

Fixes #7324.
This commit is contained in:
Fabian Homborg
2020-09-11 19:23:26 +02:00
parent c6cdc06a5b
commit 30b2dc2b97
4 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/reader.cpp
View File

@@ -2781,10 +2781,17 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
//
// Because some users set `fish_mode_prompt` to an empty function and display the mode
// elsewhere, we detect if the mode output is empty.
// Don't go into an infinite loop of repainting.
// This can happen e.g. if a variable triggers a repaint,
// and the variable is set inside the prompt (#7324).
// builtin commandline will refuse to enqueue these.
parser().libdata().is_repaint = true;
exec_mode_prompt();
if (!mode_prompt_buff.empty()) {
s_reset_line(&screen, true /* redraw prompt */);
if (this->is_repaint_needed()) this->layout_and_repaint(L"mode");
parser().libdata().is_repaint = false;
break;
}
// Else we repaint as normal.
@@ -2792,10 +2799,12 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
}
case rl::force_repaint:
case rl::repaint: {
parser().libdata().is_repaint = true;
exec_prompt();
s_reset_line(&screen, true /* redraw prompt */);
this->layout_and_repaint(L"readline");
force_exec_prompt_and_repaint = false;
parser().libdata().is_repaint = false;
break;
}
case rl::complete: