aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4831: crash when using maparg() and unmapping simplified keys

Browse Source 
Problem:    Crash when using maparg() and unmapping simplified keys.
Solution:   Do not keep a mapblock pointer. (closes #10294)
This commit is contained in:
zeertzjq 2022-04-26 21:36:21 +01:00 committed by Bram Moolenaar
parent 23f106efeb
commit 2c8a7ebdad
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map.c
View File

@ -2325,8 +2325,7 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact)
int mode; int mode;
int abbr = FALSE; int abbr = FALSE;
int get_dict = FALSE; int get_dict = FALSE;
mapblock_T *mp; mapblock_T *mp = NULL;
mapblock_T *mp_simplified = NULL;
int buffer_local; int buffer_local;
int flags = REPTERM_FROM_PART | REPTERM_DO_LT; int flags = REPTERM_FROM_PART | REPTERM_DO_LT;
@ -2362,8 +2361,6 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact)
{ {
// When the lhs is being simplified the not-simplified keys are // When the lhs is being simplified the not-simplified keys are
// preferred for printing, like in do_map(). // preferred for printing, like in do_map().
// The "rhs" and "buffer_local" values are not expected to change.
mp_simplified = mp;
(void)replace_termcodes(keys, &alt_keys_buf, (void)replace_termcodes(keys, &alt_keys_buf,
flags | REPTERM_NO_SIMPLIFY, NULL); flags | REPTERM_NO_SIMPLIFY, NULL);
rhs = check_map(alt_keys_buf, mode, exact, FALSE, abbr, &mp, rhs = check_map(alt_keys_buf, mode, exact, FALSE, abbr, &mp,
@ -2384,7 +2381,7 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact)
} }
else if (rettv_dict_alloc(rettv) != FAIL && rhs != NULL) else if (rettv_dict_alloc(rettv) != FAIL && rhs != NULL)
mapblock2dict(mp, rettv->vval.v_dict, mapblock2dict(mp, rettv->vval.v_dict,
did_simplify ? mp_simplified->m_keys : NULL, buffer_local); did_simplify ? keys_simplified : NULL, buffer_local);
vim_free(keys_buf); vim_free(keys_buf);
vim_free(alt_keys_buf); vim_free(alt_keys_buf);

7
src/testdir/test_map_functions.vim
View File

@ -74,6 +74,12 @@ func Test_maparg()
call assert_equal(['{', 'w', 's'], [d.lhs, d.rhs, d.mode]) call assert_equal(['{', 'w', 's'], [d.lhs, d.rhs, d.mode])
sunmap { sunmap {
map <C-I> foo
unmap <Tab>
" This used to cause a segfault
call maparg('<C-I>', '', 0, 1)
unmap <C-I>
map abc <Nop> map abc <Nop>
call assert_equal("<Nop>", maparg('abc')) call assert_equal("<Nop>", maparg('abc'))
unmap abc unmap abc
@ -82,6 +88,7 @@ func Test_maparg()
let d = maparg('esc', 'i', 1, 1) let d = maparg('esc', 'i', 1, 1)
call assert_equal(['esc', "\<C-V>\<C-V>\<Esc>", '!'], [d.lhs, d.rhs, d.mode]) call assert_equal(['esc', "\<C-V>\<C-V>\<Esc>", '!'], [d.lhs, d.rhs, d.mode])
abclear abclear
unlet d
endfunc endfunc
def Test_vim9_maparg() def Test_vim9_maparg()

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4831,
/**/ /**/
4830, 4830,
/**/ /**/