wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): don't use tui->params[] for 'termsync' (#26565)

Browse Source 
Problem:  'termsync' overwrites the first parameter of a format string
           when UNIBI_OUT() encounters an overflow.
Solution: Don't use tui->params[] for 'termsync'.
This commit is contained in:
zeertzjq 2023-12-14 09:32:05 +08:00 committed by GitHub
parent 5aa1ba3efe
commit 846714ca3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2269,10 +2269,11 @@ static bool should_invisible(TUIData *tui)
static size_t flush_buf_start(TUIData *tui, char *buf, size_t len)
FUNC_ATTR_NONNULL_ALL
{
const char *str = NULL;
unibi_var_t params[9]; // Don't use tui->params[] as they may already be in use.
const char *str = NULL;
if (tui->sync_output && tui->unibi_ext.sync != -1) {
UNIBI_SET_NUM_VAR(tui->params[0], 1);
UNIBI_SET_NUM_VAR(params[0], 1);
str = unibi_get_ext_str(tui->ut, (size_t)tui->unibi_ext.sync);
} else if (!tui->is_invisible) {
str = unibi_get_str(tui->ut, unibi_cursor_invisible);
@ -2283,7 +2284,7 @@ static size_t flush_buf_start(TUIData *tui, char *buf, size_t len)
return 0;
}
return unibi_run(str, tui->params, buf, len);
return unibi_run(str, params, buf, len);
}
/// Write the sequence to end flushing output to `buf`.
@ -2295,11 +2296,13 @@ static size_t flush_buf_start(TUIData *tui, char *buf, size_t len)
static size_t flush_buf_end(TUIData *tui, char *buf, size_t len)
FUNC_ATTR_NONNULL_ALL
{
unibi_var_t params[9]; // Don't use tui->params[] as they may already be in use.
size_t offset = 0;
if (tui->sync_output && tui->unibi_ext.sync != -1) {
UNIBI_SET_NUM_VAR(tui->params[0], 0);
UNIBI_SET_NUM_VAR(params[0], 0);
const char *str = unibi_get_ext_str(tui->ut, (size_t)tui->unibi_ext.sync);
offset = unibi_run(str, tui->params, buf, len);
offset = unibi_run(str, params, buf, len);
}
const char *str = NULL;
@ -2313,7 +2316,7 @@ static size_t flush_buf_end(TUIData *tui, char *buf, size_t len)
if (str != NULL) {
assert(len >= offset);
offset += unibi_run(str, tui->params, buf + offset, len - offset);
offset += unibi_run(str, params, buf + offset, len - offset);
}
return offset;