mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove '- 1' for sizes passed to xstrlcpy

Browse Source 
xstrlcpy() NUL-terminates the destination string
such that reducing the destination string length by 1
to reserve the last byte for NUL is pointless.

https://github.com/neovim/neovim/pull/14490#discussion_r635661185
This commit is contained in:
Jan Edmund Lazo
2021-05-19 21:06:49 -04:00
parent 003cda2312
commit 49ab1b91e7
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@@ -1619,7 +1619,7 @@ void list_hashtable_vars(hashtab_T *ht, const char *prefix, int empty,
char buf[IOSIZE]; char buf[IOSIZE];
// apply :filter /pat/ to variable name // apply :filter /pat/ to variable name
xstrlcpy(buf, prefix, IOSIZE - 1); xstrlcpy(buf, prefix, IOSIZE);
xstrlcat(buf, (char *)di->di_key, IOSIZE); xstrlcat(buf, (char *)di->di_key, IOSIZE);
if (message_filtered((char_u *)buf)) { if (message_filtered((char_u *)buf)) {
continue; continue;

20
src/nvim/menu.c
View File

@@ -1069,7 +1069,7 @@ char_u *get_menu_names(expand_T *xp, int idx)
#define TBUFFER_LEN 256 #define TBUFFER_LEN 256
static char_u tbuffer[TBUFFER_LEN]; /*hack*/ static char_u tbuffer[TBUFFER_LEN]; /*hack*/
char_u *str; char_u *str;
static int should_advance = FALSE; static bool should_advance = false;
if (idx == 0) { /* first call: start at first item */ if (idx == 0) { /* first call: start at first item */
menu = expand_menu; menu = expand_menu;
@@ -1089,12 +1089,13 @@ char_u *get_menu_names(expand_T *xp, int idx)
if (menu->modes & expand_modes) { if (menu->modes & expand_modes) {
if (menu->children != NULL) { if (menu->children != NULL) {
if (should_advance) if (should_advance) {
STRLCPY(tbuffer, menu->en_dname, TBUFFER_LEN - 1); STRLCPY(tbuffer, menu->en_dname, TBUFFER_LEN);
else { } else {
STRLCPY(tbuffer, menu->dname, TBUFFER_LEN - 1); STRLCPY(tbuffer, menu->dname, TBUFFER_LEN);
if (menu->en_dname == NULL) if (menu->en_dname == NULL) {
should_advance = TRUE; should_advance = true;
}
} }
/* hack on menu separators: use a 'magic' char for the separator /* hack on menu separators: use a 'magic' char for the separator
* so that '.' in names gets escaped properly */ * so that '.' in names gets escaped properly */
@@ -1105,8 +1106,9 @@ char_u *get_menu_names(expand_T *xp, int idx)
str = menu->en_dname; str = menu->en_dname;
else { else {
str = menu->dname; str = menu->dname;
if (menu->en_dname == NULL) if (menu->en_dname == NULL) {
should_advance = TRUE; should_advance = true;
}
} }
} }
} else } else

2
src/nvim/path.c
View File

@@ -65,7 +65,7 @@ FileComparison path_full_compare(char_u *const s1, char_u *const s2,
if (expandenv) { if (expandenv) {
expand_env(s1, exp1, MAXPATHL); expand_env(s1, exp1, MAXPATHL);
} else { } else {
xstrlcpy((char *)exp1, (const char *)s1, MAXPATHL - 1); xstrlcpy((char *)exp1, (const char *)s1, MAXPATHL);
} }
bool id_ok_1 = os_fileid((char *)exp1, &file_id_1); bool id_ok_1 = os_fileid((char *)exp1, &file_id_1);
bool id_ok_2 = os_fileid((char *)s2, &file_id_2); bool id_ok_2 = os_fileid((char *)s2, &file_id_2);

6
src/nvim/quickfix.c
View File

@@ -3919,13 +3919,13 @@ static int qf_buf_add_line(buf_T *buf, linenr_T lnum, const qfline_T *qfp,
buf_T *errbuf; buf_T *errbuf;
if (qfp->qf_module != NULL) { if (qfp->qf_module != NULL) {
STRLCPY(IObuff, qfp->qf_module, IOSIZE - 1); STRLCPY(IObuff, qfp->qf_module, IOSIZE);
len = (int)STRLEN(IObuff); len = (int)STRLEN(IObuff);
} else if (qfp->qf_fnum != 0 } else if (qfp->qf_fnum != 0
&& (errbuf = buflist_findnr(qfp->qf_fnum)) != NULL && (errbuf = buflist_findnr(qfp->qf_fnum)) != NULL
&& errbuf->b_fname != NULL) { && errbuf->b_fname != NULL) {
if (qfp->qf_type == 1) { // :helpgrep if (qfp->qf_type == 1) { // :helpgrep
STRLCPY(IObuff, path_tail(errbuf->b_fname), IOSIZE - 1); STRLCPY(IObuff, path_tail(errbuf->b_fname), IOSIZE);
} else { } else {
// Shorten the file name if not done already. // Shorten the file name if not done already.
// For optimization, do this only for the first entry in a // For optimization, do this only for the first entry in a
@@ -3938,7 +3938,7 @@ static int qf_buf_add_line(buf_T *buf, linenr_T lnum, const qfline_T *qfp,
} }
shorten_buf_fname(errbuf, dirname, false); shorten_buf_fname(errbuf, dirname, false);
} }
STRLCPY(IObuff, errbuf->b_fname, IOSIZE - 1); STRLCPY(IObuff, errbuf->b_fname, IOSIZE);
} }
len = (int)STRLEN(IObuff); len = (int)STRLEN(IObuff);
} else { } else {