IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): avoid stack-use-after-scope with cursor color (#22435)

Browse Source
This commit is contained in:
zeertzjq 2023-02-28 07:19:03 +08:00 committed by GitHub
parent fb2ead6cf3
commit 2630341db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/tui/tui.c
View File

@ -1109,8 +1109,8 @@ void tui_set_mode(TUIData *tui, ModeShape mode)
// Hopefully the user's default cursor color is inverse.
unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color);
} else {
char hexbuf[8];
if (tui->set_cursor_color_as_str) {
char hexbuf[8];
snprintf(hexbuf, 7 + 1, "#%06x", aep.rgb_bg_color);
UNIBI_SET_STR_VAR(tui->params[0], hexbuf);
} else {

36
test/functional/terminal/tui_spec.lua
View File

@ -1512,6 +1512,42 @@ describe('TUI', function()
exec_lua([[vim.loop.kill(vim.fn.jobpid(vim.bo.channel), 'sigterm')]])
screen:expect({any = '%[Process exited 1%]'})
end)
it('no stack-use-after-scope with cursor color #22432', function()
screen:set_option('rgb', true)
command('set termguicolors')
child_session:request('nvim_exec', [[
set tgc
hi Cursor guifg=Red guibg=Green
set guicursor=n:block-Cursor/lCursor
]], false)
screen:set_default_attr_ids({
[1] = {reverse = true},
[2] = {bold = true, foreground = Screen.colors.Blue},
[3] = {foreground = Screen.colors.Blue},
[4] = {reverse = true, bold = true},
[5] = {bold = true},
})
screen:expect([[
{1: } |
{2:~}{3: }|
{2:~}{3: }|
{2:~}{3: }|
{4:[No Name] }|
|
{5:-- TERMINAL --} |
]])
feed('i')
screen:expect([[
{1: } |
{2:~}{3: }|
{2:~}{3: }|
{2:~}{3: }|
{4:[No Name] }|
{5:-- INSERT --} |
{5:-- TERMINAL --} |
]])
end)
end)
describe('TUI', function()