diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-26 21:36:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-26 21:36:21 +0100 |
| commit | 2c8a7ebdad9da017bfb6dc8a0f46acea77ec2e17 (patch) | |
| tree | f993d9b62e1c3d2cb91fe86267abe5a672bb41d5 | |
| parent | 23f106efeb64eadd95adee34144f64526aa5f61f (diff) | |
| download | vim-git-2c8a7ebdad9da017bfb6dc8a0f46acea77ec2e17.tar.gz | |
patch 8.2.4831: crash when using maparg() and unmapping simplified keysv8.2.4831
Problem: Crash when using maparg() and unmapping simplified keys.
Solution: Do not keep a mapblock pointer. (closes #10294)
| -rw-r--r-- | src/map.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_map_functions.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 5 deletions
@@ -2325,8 +2325,7 @@ get_maparg(typval_T *argvars, typval_T *rettv, int exact) int mode; int abbr = FALSE; int get_dict = FALSE; - mapblock_T *mp; - mapblock_T *mp_simplified = NULL; + mapblock_T *mp = NULL; int buffer_local; 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 // 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, flags | REPTERM_NO_SIMPLIFY, NULL); 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) 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(alt_keys_buf); diff --git a/src/testdir/test_map_functions.vim b/src/testdir/test_map_functions.vim index 8b2f6a853..66f347903 100644 --- a/src/testdir/test_map_functions.vim +++ b/src/testdir/test_map_functions.vim @@ -74,6 +74,12 @@ func Test_maparg() call assert_equal(['{', 'w', 's'], [d.lhs, d.rhs, d.mode]) 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> call assert_equal("<Nop>", maparg('abc')) unmap abc @@ -82,6 +88,7 @@ func Test_maparg() let d = maparg('esc', 'i', 1, 1) call assert_equal(['esc', "\<C-V>\<C-V>\<Esc>", '!'], [d.lhs, d.rhs, d.mode]) abclear + unlet d endfunc def Test_vim9_maparg() diff --git a/src/version.c b/src/version.c index 1c799d89e..ba2753279 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4831, +/**/ 4830, /**/ 4829, |