# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1656534603 -7200
# Node ID a538982f74ead73e5368223180c3043a868d5290
# Parent  d78c62e61b42ca61bce6633fb3739c6d9663bf7e
patch 9.0.0009: going past the end of a menu item with only modifier

Commit: https://github.com/vim/vim/commit/083692d598139228e101b8c521aaef7bcf256e9a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jun 29 21:16:58 2022 +0100

    patch 9.0.0009: going past the end of a menu item with only modifier

    Problem:    Going past the end of a menu item with only modifier.
    Solution:   Check for NUL.

diff --git a/src/message.c b/src/message.c
--- a/src/message.c
+++ b/src/message.c
@@ -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.
diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    9,
+/**/
     8,
 /**/
     7,