patch 8.2.0253: crash when using :disassamble without argument

Problem:    Crash when using :disassamble without argument. (Dhiraj Mishra)
Solution:   Check for missing argument. (Dominique Pelle, closes #5635,
            closes #5637)

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 10b9ed72338d46615fc0cf3b5578e5fb852c3812..f09fb3bffaf10c9c4b719e1896d6225ebe38a907 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -479,7 +479,7 @@ EXCMD(CMD_digraphs, "digraphs",     ex_digraphs,
        EX_BANG|EX_EXTRA|EX_TRLBAR|EX_CMDWIN,
        ADDR_NONE),
 EXCMD(CMD_disassemble, "disassemble",  ex_disassemble,
-       EX_EXTRA|EX_TRLBAR|EX_CMDWIN,
+       EX_EXTRA|EX_NEEDARG|EX_TRLBAR|EX_CMDWIN,
        ADDR_NONE),
 EXCMD(CMD_djump,       "djump",        ex_findpat,
        EX_BANG|EX_RANGE|EX_DFLALL|EX_WHOLEFOLD|EX_EXTRA,

diff --git a/src/testdir/test_vim9_disassemble.vim b/src/testdir/test_vim9_disassemble.vim
index d10e74148db500546206b3dfc379649079c4373b..a873c86571569502840cdd7eb64b24f12dde3ef0 100644 (file)
--- a/src/testdir/test_vim9_disassemble.vim
+++ b/src/testdir/test_vim9_disassemble.vim
@@ -23,6 +23,10 @@ enddef
 def Test_disassemble_load()
   assert_fails('disass NoFunc', 'E1061:')
   assert_fails('disass NotCompiled', 'E1062:')
+  assert_fails('disass', 'E471:')
+  assert_fails('disass [', 'E475:')
+  assert_fails('disass 234', 'E475:')
+  assert_fails('disass <XX>foo', 'E475:')
 
   let res = execute('disass s:ScriptFuncLoad')
   assert_match('<SNR>\d*_ScriptFuncLoad.*'

diff --git a/src/version.c b/src/version.c
index 8ebbf491c5eb6914adaf3562e2f7bcfca59dfeb6..0499e5da19ea0e9f4f89b85e414f1b06c2b7ea70 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    253,
 /**/
     252,
 /**/

diff --git a/src/vim9execute.c b/src/vim9execute.c
index ed3a75b106e3c74787ffc776ddb4eb7c42c6ec77..c31506a86df2c75521b9aaa6490146ff37d29ce6 100644 (file)
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1590,6 +1590,7 @@ failed:
     void
 ex_disassemble(exarg_T *eap)
 {
+    char_u     *arg = eap->arg;
     char_u     *fname;
     ufunc_T    *ufunc;
     dfunc_T    *dfunc;
@@ -1598,8 +1599,14 @@ ex_disassemble(exarg_T *eap)
     int                line_idx = 0;
     int                prev_current = 0;
 
-    fname = trans_function_name(&eap->arg, FALSE,
+    fname = trans_function_name(&arg, FALSE,
             TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD | TFN_NO_DEREF, NULL, NULL);
+    if (fname == NULL)
+    {
+       semsg(_(e_invarg2), eap->arg);
+       return;
+    }
+
     ufunc = find_func(fname, NULL);
     vim_free(fname);
     if (ufunc == NULL)