neovim

commit 57ce6c2b8ff1dc3045f6e6be325d3e6b6b4fb15c
parent 79872f377019614467a8e03049fb47c067331804
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Wed, 27 Jul 2022 12:27:42 +0800

Merge pull request #19531 from zeertzjq/vim-8.2.4623

vim-patch:8.2.{4623,4625}: coverity warnings
Diffstat:
M
src/nvim/ex_cmds.c
 | 
9
++++++---
M
src/nvim/ex_docmd.c
 | 
9
+++++----

2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
@@ -5580,12 +5580,15 @@ static void helptags_one(char *dir, const char *ext, const char *tagfname, bool 
   // Note: We cannot just do `&NameBuff` because it is a statically sized array
   //       so `NameBuff == &NameBuff` according to C semantics.
   char *buff_list[1] = { (char *)NameBuff };
-  if (gen_expand_wildcards(1, (char_u **)buff_list, &filecount, (char_u ***)&files,
-                           EW_FILE|EW_SILENT) == FAIL
-      || filecount == 0) {
+  const int res = gen_expand_wildcards(1, (char_u **)buff_list, &filecount, (char_u ***)&files,
+                                       EW_FILE|EW_SILENT);
+  if (res == FAIL || filecount == 0) {
     if (!got_int) {
       semsg(_("E151: No match: %s"), NameBuff);
     }
+    if (res != FAIL) {
+      FreeWild(filecount, (char_u **)files);
+    }
     return;
   }
 
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -3271,6 +3271,7 @@ int cmd_exists(const char *const name)
   // For ":2match" and ":3match" we need to skip the number.
   ea.cmd = (char *)((*name == '2' || *name == '3') ? name + 1 : name);
   ea.cmdidx = (cmdidx_T)0;
+  ea.flags = 0;
   int full = false;
   p = find_ex_command(&ea, &full);
   if (p == NULL) {
@@ -3288,6 +3289,7 @@ int cmd_exists(const char *const name)
 /// "fullcommand" function
 void f_fullcommand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
+  exarg_T ea;
   char *name = argvars[0].vval.v_string;
 
   rettv->v_type = VAR_STRING;
@@ -3301,10 +3303,9 @@ void f_fullcommand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   }
   name = skip_range(name, NULL);
 
-  exarg_T ea = {
-    .cmd = (*name == '2' || *name == '3') ? name + 1 : name,
-    .cmdidx = (cmdidx_T)0,
-  };
+  ea.cmd = (*name == '2' || *name == '3') ? name + 1 : name;
+  ea.cmdidx = (cmdidx_T)0;
+  ea.flags = 0;
   char *p = find_ex_command(&ea, NULL);
   if (p == NULL || ea.cmdidx == CMD_SIZE) {
     return;