From 7e2b75760f1723c44bf69951dad2cb8da92aa213 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 11 Mar 2025 06:54:17 +0800 Subject: vim-patch:9.1.1193: Unnecessary use of STRCAT() in au_event_disable() (#32829) Problem: Unnecessary use of STRCAT() in au_event_disable(). STRCAT() seeks to the end of new_ei, but here the end is already known. Solution: Use STRCPY() and add p_ei_len to new_ei. Also fix a typo in a comment. Add a test that 'eventignore' works in :argdo (zeertzjq). closes: vim/vim#16844 https://github.com/vim/vim/commit/969e11a18b145241dc0ab39fc1be7ed814655dfc Cherry-pick p_ei_len from patch 9.1.0256. --- src/nvim/autocmd.c | 7 ++++--- src/nvim/ex_getln.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c index c00a5814b1..1246b2fc5c 100644 --- a/src/nvim/autocmd.c +++ b/src/nvim/autocmd.c @@ -700,12 +700,13 @@ int check_ei(char *ei) // Returns the old value of 'eventignore' in allocated memory. char *au_event_disable(char *what) { - char *save_ei = xstrdup(p_ei); - char *new_ei = xstrnsave(p_ei, strlen(p_ei) + strlen(what)); + size_t p_ei_len = strlen(p_ei); + char *save_ei = xmemdupz(p_ei, p_ei_len); + char *new_ei = xstrnsave(p_ei, p_ei_len + strlen(what)); if (*what == ',' && *p_ei == NUL) { STRCPY(new_ei, what + 1); } else { - strcat(new_ei, what); + STRCPY(new_ei + p_ei_len, what); } set_option_direct(kOptEventignore, CSTR_AS_OPTVAL(new_ei), 0, SID_NONE); xfree(new_ei); diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 240bdae6cb..22b5d7accd 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -4528,7 +4528,7 @@ static int open_cmdwin(void) State = MODE_NORMAL; setmouse(); - // Reset here so it can be set by a CmdWinEnter autocommand. + // Reset here so it can be set by a CmdwinEnter autocommand. cmdwin_result = 0; // Trigger CmdwinEnter autocommands. -- cgit