Mercurial > vim
changeset 28614:9ae2c32841fb v8.2.4831
patch 8.2.4831: crash when using maparg() and unmapping simplified keys
Commit: https://github.com/vim/vim/commit/2c8a7ebdad9da017bfb6dc8a0f46acea77ec2e17
Author: zeertzjq <zeertzjq@outlook.com>
Date: Tue Apr 26 21:36:21 2022 +0100
patch 8.2.4831: crash when using maparg() and unmapping simplified keys
Problem: Crash when using maparg() and unmapping simplified keys.
Solution: Do not keep a mapblock pointer. (closes https://github.com/vim/vim/issues/10294)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 26 Apr 2022 22:45:03 +0200 |
parents | a56f5442fd9a |
children | 3f75d7165fc5 |
files | src/map.c src/testdir/test_map_functions.vim src/version.c |
diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/map.c +++ b/src/map.c @@ -2325,8 +2325,7 @@ get_maparg(typval_T *argvars, typval_T * 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 * { // 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 * } 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);
--- 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()