neovim

commit 78658ef3834baf7d202eb16a8778813e08e58412
parent 3ee6c05b4b5fa253bdf64fff68c71763b5d816b7
Author: Famiu Haque <famiuhaque@protonmail.com>
Date:   Wed, 10 Aug 2022 16:37:59 +0600

fix(api): `vim.cmd.make` crashes when argument count isn't 1 (#19701)

Closes #19696
Diffstat:
M
src/nvim/api/command.c
 | 
7
+++++--
M
test/functional/api/vim_spec.lua
 | 
7
+++++++

2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/nvim/api/command.c b/src/nvim/api/command.c
@@ -819,9 +819,12 @@ static void build_cmdline_str(char **cmdlinep, exarg_T *eap, CmdParseInfo *cmdin
   char *p = replace_makeprg(eap, eap->arg, cmdlinep);
   if (p != eap->arg) {
     // If replace_makeprg modified the cmdline string, correct the argument pointers.
-    assert(argc == 1);
     eap->arg = p;
-    eap->args[0] = p;
+    // We can only know the position of the first argument because the argument list can be used
+    // multiple times in makeprg / grepprg.
+    if (argc >= 1) {
+      eap->args[0] = p;
+    }
   }
 }
 
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
@@ -3829,5 +3829,12 @@ describe('API', function()
       eq({'aa'}, meths.buf_get_lines(0, 0, 1, false))
       assert_alive()
     end)
+    it("'make' command works when argument count isn't 1 #19696", function()
+      command('set makeprg=echo')
+      meths.cmd({ cmd = 'make' }, {})
+      assert_alive()
+      meths.cmd({ cmd = 'make', args = { 'foo', 'bar' } }, {})
+      assert_alive()
+    end)
   end)
 end)