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

vim-patch:9.1.0644: Unnecessary STRLEN() when applying mapping (#29921)

Browse Source 
Problem:  Unnecessary STRLEN() when applying mapping.
          (after v9.1.0642)
Solution: Use m_keylen and vim_strnsave().
          (zeertzjq)

closes: vim/vim#15394

74011dc1fa
This commit is contained in:
zeertzjq
2024-07-31 06:21:55 +08:00
committed by GitHub
parent 617810d72d
commit 63cd2adf3d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/getchar.c
View File

@@ -2335,6 +2335,7 @@ static int handle_mapping(int *keylenp, const bool *timedout, int *mapdepth)
const bool save_m_silent = mp->m_silent; const bool save_m_silent = mp->m_silent;
char *save_m_keys = NULL; // only saved when needed char *save_m_keys = NULL; // only saved when needed
char *save_alt_m_keys = NULL; // only saved when needed char *save_alt_m_keys = NULL; // only saved when needed
const int save_alt_m_keylen = mp->m_alt != NULL ? mp->m_alt->m_keylen : 0;
// Handle ":map <expr>": evaluate the {rhs} as an // Handle ":map <expr>": evaluate the {rhs} as an
// expression. Also save and restore the command line // expression. Also save and restore the command line
@@ -2347,8 +2348,10 @@ static int handle_mapping(int *keylenp, const bool *timedout, int *mapdepth)
vgetc_busy = 0; vgetc_busy = 0;
may_garbage_collect = false; may_garbage_collect = false;
save_m_keys = xstrdup(mp->m_keys); save_m_keys = xmemdupz(mp->m_keys, (size_t)mp->m_keylen);
save_alt_m_keys = mp->m_alt != NULL ? xstrdup(mp->m_alt->m_keys) : NULL; save_alt_m_keys = mp->m_alt != NULL
? xmemdupz(mp->m_alt->m_keys, (size_t)save_alt_m_keylen)
: NULL;
map_str = eval_map_expr(mp, NUL); map_str = eval_map_expr(mp, NUL);
if ((map_str == NULL || *map_str == NUL)) { if ((map_str == NULL || *map_str == NUL)) {
@@ -2401,11 +2404,11 @@ static int handle_mapping(int *keylenp, const bool *timedout, int *mapdepth)
? strncmp(map_str, save_m_keys, (size_t)keylen) == 0 ? strncmp(map_str, save_m_keys, (size_t)keylen) == 0
|| (save_alt_m_keys != NULL || (save_alt_m_keys != NULL
&& strncmp(map_str, save_alt_m_keys, && strncmp(map_str, save_alt_m_keys,
strlen(save_alt_m_keys)) == 0) (size_t)save_alt_m_keylen) == 0)
: strncmp(map_str, mp->m_keys, (size_t)keylen) == 0 : strncmp(map_str, mp->m_keys, (size_t)keylen) == 0
|| (mp->m_alt != NULL || (mp->m_alt != NULL
&& strncmp(map_str, mp->m_alt->m_keys, && strncmp(map_str, mp->m_alt->m_keys,
strlen(mp->m_alt->m_keys)) == 0)) { (size_t)mp->m_alt->m_keylen) == 0)) {
noremap = REMAP_SKIP; noremap = REMAP_SKIP;
} else { } else {
noremap = REMAP_YES; noremap = REMAP_YES;

4
test/old/testdir/test_mapping.vim
View File

@@ -1694,11 +1694,11 @@ func Test_map_rhs_starts_with_lhs()
endif endif
let @a = 'foo' let @a = 'foo'
call feedkeys("S\<C-R>a", 'tx') call assert_nobeep('call feedkeys("S\<C-R>a", "tx")')
call assert_equal('foo', getline('.')) call assert_equal('foo', getline('.'))
let @a = 'bar' let @a = 'bar'
call feedkeys("S\<*C-R>a", 'tx') call assert_nobeep('call feedkeys("S\<*C-R>a", "tx")')
call assert_equal('bar', getline('.')) call assert_equal('bar', getline('.'))
endfor endfor
endfor endfor