Skip to content

Commit

Permalink
patch 9.0.0009: going past the end of a menu item with only modifier
Browse files Browse the repository at this point in the history
Problem:    Going past the end of a menu item with only modifier.
Solution:   Check for NUL.
  • Loading branch information
brammool committed Jun 29, 2022
1 parent 83e1180 commit 083692d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/message.c
Expand Up @@ -1820,8 +1820,8 @@ str2special(
*sp = str + 1;
}
else
// single-byte character or illegal byte
*sp = str + 1;
// single-byte character, NUL or illegal byte
*sp = str + (*str == NUL ? 0 : 1);

// Make special keys and C0 control characters in <> form, also <M-Space>.
// Use <Space> only for lhs of a mapping.
Expand Down
13 changes: 13 additions & 0 deletions src/testdir/test_menu.vim
Expand Up @@ -528,4 +528,17 @@ func Test_tmenu()
tunmenu Test
endfunc

func Test_only_modifier()
exe "tmenu a.b \x80\xfc0"
let exp =<< trim [TEXT]
--- Menus ---
500 a
500 b
t - <T-2-^@>
[TEXT]
call assert_equal(exp, split(execute('tmenu'), "\n"))

tunmenu a.b
endfunc

" vim: shiftwidth=2 sts=2 expandtab
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -735,6 +735,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
9,
/**/
8,
/**/
Expand Down

0 comments on commit 083692d

Please sign in to comment.