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

vim-patch:9.1.1028: too many strlen() calls in screen.c (#32083)

Browse Source 
Problem:  too many strlen() calls in screen.c
Solution: refactor screen.c and remove calls to strlen(),
          verify that leadmultispace != NULL (John Marriott)

closes: vim/vim#16460

c15de972e8

Co-authored-by: John Marriott <basilisk@internode.on.net>
This commit is contained in:
zeertzjq 2025-01-18 10:03:13 +08:00 committed by GitHub
parent c6cc937512
commit c9000a6b13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/drawscreen.c
View File

@ -2580,9 +2580,9 @@ int compute_foldcolumn(win_T *wp, int col)
{ {
int fdc = win_fdccol_count(wp); int fdc = win_fdccol_count(wp);
int wmw = wp == curwin && p_wmw == 0 ? 1 : (int)p_wmw; int wmw = wp == curwin && p_wmw == 0 ? 1 : (int)p_wmw;
int wwidth = wp->w_grid.cols; int n = wp->w_grid.cols - (col + wmw);
return MIN(fdc, wwidth - (col + wmw)); return MIN(fdc, n);
} }
/// Return the width of the 'number' and 'relativenumber' column. /// Return the width of the 'number' and 'relativenumber' column.

112
src/nvim/optionstr.c
View File

@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "nvim/api/private/defs.h"
#include "nvim/ascii_defs.h" #include "nvim/ascii_defs.h"
#include "nvim/autocmd.h" #include "nvim/autocmd.h"
#include "nvim/buffer_defs.h" #include "nvim/buffer_defs.h"
@ -2086,49 +2087,54 @@ static schar_T get_encoded_char_adv(const char **p)
} }
struct chars_tab { struct chars_tab {
schar_T *cp; ///< char value schar_T *cp; ///< char value
const char *name; ///< char id String name; ///< char id
const char *def; ///< default value const char *def; ///< default value
const char *fallback; ///< default value when "def" isn't single-width const char *fallback; ///< default value when "def" isn't single-width
}; };
#define CHARSTAB_ENTRY(cp, name, def, fallback) \
{ (cp), { name, STRLEN_LITERAL(name) }, def, fallback }
static fcs_chars_T fcs_chars; static fcs_chars_T fcs_chars;
static const struct chars_tab fcs_tab[] = { static const struct chars_tab fcs_tab[] = {
{ &fcs_chars.stl, "stl", " ", NULL }, CHARSTAB_ENTRY(&fcs_chars.stl, "stl", " ", NULL),
{ &fcs_chars.stlnc, "stlnc", " ", NULL }, CHARSTAB_ENTRY(&fcs_chars.stlnc, "stlnc", " ", NULL),
{ &fcs_chars.wbr, "wbr", " ", NULL }, CHARSTAB_ENTRY(&fcs_chars.wbr, "wbr", " ", NULL),
{ &fcs_chars.horiz, "horiz", "─", "-" }, CHARSTAB_ENTRY(&fcs_chars.horiz, "horiz", "─", "-"),
{ &fcs_chars.horizup, "horizup", "┴", "-" }, CHARSTAB_ENTRY(&fcs_chars.horizup, "horizup", "┴", "-"),
{ &fcs_chars.horizdown, "horizdown", "┬", "-" }, CHARSTAB_ENTRY(&fcs_chars.horizdown, "horizdown", "┬", "-"),
{ &fcs_chars.vert, "vert", "│", "|" }, CHARSTAB_ENTRY(&fcs_chars.vert, "vert", "│", "|"),
{ &fcs_chars.vertleft, "vertleft", "┤", "|" }, CHARSTAB_ENTRY(&fcs_chars.vertleft, "vertleft", "┤", "|"),
{ &fcs_chars.vertright, "vertright", "├", "|" }, CHARSTAB_ENTRY(&fcs_chars.vertright, "vertright", "├", "|"),
{ &fcs_chars.verthoriz, "verthoriz", "┼", "+" }, CHARSTAB_ENTRY(&fcs_chars.verthoriz, "verthoriz", "┼", "+"),
{ &fcs_chars.fold, "fold", "·", "-" }, CHARSTAB_ENTRY(&fcs_chars.fold, "fold", "·", "-"),
{ &fcs_chars.foldopen, "foldopen", "-", NULL }, CHARSTAB_ENTRY(&fcs_chars.foldopen, "foldopen", "-", NULL),
{ &fcs_chars.foldclosed, "foldclose", "+", NULL }, CHARSTAB_ENTRY(&fcs_chars.foldclosed, "foldclose", "+", NULL),
{ &fcs_chars.foldsep, "foldsep", "│", "|" }, CHARSTAB_ENTRY(&fcs_chars.foldsep, "foldsep", "│", "|"),
{ &fcs_chars.diff, "diff", "-", NULL }, CHARSTAB_ENTRY(&fcs_chars.diff, "diff", "-", NULL),
{ &fcs_chars.msgsep, "msgsep", " ", NULL }, CHARSTAB_ENTRY(&fcs_chars.msgsep, "msgsep", " ", NULL),
{ &fcs_chars.eob, "eob", "~", NULL }, CHARSTAB_ENTRY(&fcs_chars.eob, "eob", "~", NULL),
{ &fcs_chars.lastline, "lastline", "@", NULL }, CHARSTAB_ENTRY(&fcs_chars.lastline, "lastline", "@", NULL),
}; };
static lcs_chars_T lcs_chars; static lcs_chars_T lcs_chars;
static const struct chars_tab lcs_tab[] = { static const struct chars_tab lcs_tab[] = {
{ &lcs_chars.eol, "eol", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.eol, "eol", NULL, NULL),
{ &lcs_chars.ext, "extends", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.ext, "extends", NULL, NULL),
{ &lcs_chars.nbsp, "nbsp", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.nbsp, "nbsp", NULL, NULL),
{ &lcs_chars.prec, "precedes", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.prec, "precedes", NULL, NULL),
{ &lcs_chars.space, "space", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.space, "space", NULL, NULL),
{ &lcs_chars.tab2, "tab", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.tab2, "tab", NULL, NULL),
{ &lcs_chars.lead, "lead", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.lead, "lead", NULL, NULL),
{ &lcs_chars.trail, "trail", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.trail, "trail", NULL, NULL),
{ &lcs_chars.conceal, "conceal", NULL, NULL }, CHARSTAB_ENTRY(&lcs_chars.conceal, "conceal", NULL, NULL),
{ NULL, "multispace", NULL, NULL }, CHARSTAB_ENTRY(NULL, "multispace", NULL, NULL),
{ NULL, "leadmultispace", NULL, NULL }, CHARSTAB_ENTRY(NULL, "leadmultispace", NULL, NULL),
}; };
#undef CHARSTAB_ENTRY
static char *field_value_err(char *errbuf, size_t errbuflen, const char *fmt, const char *field) static char *field_value_err(char *errbuf, size_t errbuflen, const char *fmt, const char *field)
{ {
if (errbuf == NULL) { if (errbuf == NULL) {
@ -2209,13 +2215,13 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
while (*p) { while (*p) {
int i; int i;
for (i = 0; i < entries; i++) { for (i = 0; i < entries; i++) {
const size_t len = strlen(tab[i].name); if (!(strncmp(p, tab[i].name.data,
if (!(strncmp(p, tab[i].name, len) == 0 && p[len] == ':')) { tab[i].name.size) == 0 && p[tab[i].name.size] == ':')) {
continue; continue;
} }
if (what == kListchars && strcmp(tab[i].name, "multispace") == 0) { const char *s = p + tab[i].name.size + 1;
const char *s = p + len + 1; if (what == kListchars && strcmp(tab[i].name.data, "multispace") == 0) {
if (round == 0) { if (round == 0) {
// Get length of lcs-multispace string in the first round // Get length of lcs-multispace string in the first round
last_multispace = p; last_multispace = p;
@ -2225,7 +2231,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
if (c1 == 0) { if (c1 == 0) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_character_width_for_field_str, e_wrong_character_width_for_field_str,
tab[i].name); tab[i].name.data);
} }
multispace_len++; multispace_len++;
} }
@ -2233,7 +2239,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
// lcs-multispace cannot be an empty string // lcs-multispace cannot be an empty string
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_number_of_characters_for_field_str, e_wrong_number_of_characters_for_field_str,
tab[i].name); tab[i].name.data);
} }
p = s; p = s;
} else { } else {
@ -2249,8 +2255,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
break; break;
} }
if (what == kListchars && strcmp(tab[i].name, "leadmultispace") == 0) { if (what == kListchars && strcmp(tab[i].name.data, "leadmultispace") == 0) {
const char *s = p + len + 1;
if (round == 0) { if (round == 0) {
// get length of lcs-leadmultispace string in first round // get length of lcs-leadmultispace string in first round
last_lmultispace = p; last_lmultispace = p;
@ -2260,7 +2265,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
if (c1 == 0) { if (c1 == 0) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_character_width_for_field_str, e_wrong_character_width_for_field_str,
tab[i].name); tab[i].name.data);
} }
lead_multispace_len++; lead_multispace_len++;
} }
@ -2268,7 +2273,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
// lcs-leadmultispace cannot be an empty string // lcs-leadmultispace cannot be an empty string
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_number_of_characters_for_field_str, e_wrong_number_of_characters_for_field_str,
tab[i].name); tab[i].name.data);
} }
p = s; p = s;
} else { } else {
@ -2284,17 +2289,16 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
break; break;
} }
const char *s = p + len + 1;
if (*s == NUL) { if (*s == NUL) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_number_of_characters_for_field_str, e_wrong_number_of_characters_for_field_str,
tab[i].name); tab[i].name.data);
} }
schar_T c1 = get_encoded_char_adv(&s); schar_T c1 = get_encoded_char_adv(&s);
if (c1 == 0) { if (c1 == 0) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_character_width_for_field_str, e_wrong_character_width_for_field_str,
tab[i].name); tab[i].name.data);
} }
schar_T c2 = 0; schar_T c2 = 0;
schar_T c3 = 0; schar_T c3 = 0;
@ -2302,20 +2306,20 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
if (*s == NUL) { if (*s == NUL) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_number_of_characters_for_field_str, e_wrong_number_of_characters_for_field_str,
tab[i].name); tab[i].name.data);
} }
c2 = get_encoded_char_adv(&s); c2 = get_encoded_char_adv(&s);
if (c2 == 0) { if (c2 == 0) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_character_width_for_field_str, e_wrong_character_width_for_field_str,
tab[i].name); tab[i].name.data);
} }
if (!(*s == ',' || *s == NUL)) { if (!(*s == ',' || *s == NUL)) {
c3 = get_encoded_char_adv(&s); c3 = get_encoded_char_adv(&s);
if (c3 == 0) { if (c3 == 0) {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_character_width_for_field_str, e_wrong_character_width_for_field_str,
tab[i].name); tab[i].name.data);
} }
} }
} }
@ -2335,7 +2339,7 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
} else { } else {
return field_value_err(errbuf, errbuflen, return field_value_err(errbuf, errbuflen,
e_wrong_number_of_characters_for_field_str, e_wrong_number_of_characters_for_field_str,
tab[i].name); tab[i].name.data);
} }
} }
@ -2366,22 +2370,22 @@ const char *set_chars_option(win_T *wp, const char *value, CharsOption what, boo
/// 'fillchars' option. /// 'fillchars' option.
char *get_fillchars_name(expand_T *xp FUNC_ATTR_UNUSED, int idx) char *get_fillchars_name(expand_T *xp FUNC_ATTR_UNUSED, int idx)
{ {
if (idx >= (int)ARRAY_SIZE(fcs_tab)) { if (idx < 0 || idx >= (int)ARRAY_SIZE(fcs_tab)) {
return NULL; return NULL;
} }
return (char *)fcs_tab[idx].name; return fcs_tab[idx].name.data;
} }
/// Function given to ExpandGeneric() to obtain possible arguments of the /// Function given to ExpandGeneric() to obtain possible arguments of the
/// 'listchars' option. /// 'listchars' option.
char *get_listchars_name(expand_T *xp FUNC_ATTR_UNUSED, int idx) char *get_listchars_name(expand_T *xp FUNC_ATTR_UNUSED, int idx)
{ {
if (idx >= (int)ARRAY_SIZE(lcs_tab)) { if (idx < 0 || idx >= (int)ARRAY_SIZE(lcs_tab)) {
return NULL; return NULL;
} }
return (char *)lcs_tab[idx].name; return lcs_tab[idx].name.data;
} }
/// Check all global and local values of 'listchars' and 'fillchars'. /// Check all global and local values of 'listchars' and 'fillchars'.

9
src/nvim/statusline.c
View File

@ -772,8 +772,7 @@ void draw_tabline(void)
if (modified || wincount > 1) { if (modified || wincount > 1) {
if (wincount > 1) { if (wincount > 1) {
vim_snprintf(NameBuff, MAXPATHL, "%d", wincount); int len = vim_snprintf(NameBuff, MAXPATHL, "%d", wincount);
int len = (int)strlen(NameBuff);
if (col + len >= Columns - 3) { if (col + len >= Columns - 3) {
break; break;
} }
@ -798,7 +797,8 @@ void draw_tabline(void)
len -= ptr2cells(p); len -= ptr2cells(p);
MB_PTR_ADV(p); MB_PTR_ADV(p);
} }
len = MIN(len, Columns - col - 1); int n = Columns - col - 1;
len = MIN(len, n);
grid_line_puts(col, p, -1, attr); grid_line_puts(col, p, -1, attr);
col += len; col += len;
@ -832,7 +832,8 @@ void draw_tabline(void)
// Draw the 'showcmd' information if 'showcmdloc' == "tabline". // Draw the 'showcmd' information if 'showcmdloc' == "tabline".
if (p_sc && *p_sloc == 't') { if (p_sc && *p_sloc == 't') {
const int sc_width = MIN(10, (int)Columns - col - (tabcount > 1) * 3); int n = Columns - col - (tabcount > 1) * 3;
const int sc_width = MIN(10, n);
if (sc_width > 0) { if (sc_width > 0) {
grid_line_puts(Columns - sc_width - (tabcount > 1) * 2, grid_line_puts(Columns - sc_width - (tabcount > 1) * 2,