mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-20 17:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19531 from zeertzjq/vim-8.2.4623

Browse Source 
vim-patch:8.2.{4623,4625}: coverity warnings
This commit is contained in:
zeertzjq
2022-07-27 12:27:42 +08:00
committed by GitHub
parent 79872f3770 bbad7371db
commit 57ce6c2b8f
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/ex_cmds.c
View File

@@ -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 // Note: We cannot just do `&NameBuff` because it is a statically sized array
// so `NameBuff == &NameBuff` according to C semantics. // so `NameBuff == &NameBuff` according to C semantics.
char *buff_list[1] = { (char *)NameBuff }; char *buff_list[1] = { (char *)NameBuff };
if (gen_expand_wildcards(1, (char_u **)buff_list, &filecount, (char_u ***)&files, const int res = gen_expand_wildcards(1, (char_u **)buff_list, &filecount, (char_u ***)&files,
EW_FILE|EW_SILENT) == FAIL EW_FILE|EW_SILENT);
|| filecount == 0) { if (res == FAIL || filecount == 0) {
if (!got_int) { if (!got_int) {
semsg(_("E151: No match: %s"), NameBuff); semsg(_("E151: No match: %s"), NameBuff);
} }
if (res != FAIL) {
FreeWild(filecount, (char_u **)files);
}
return; return;
} }

9
src/nvim/ex_docmd.c
View File

@@ -3271,6 +3271,7 @@ int cmd_exists(const char *const name)
// For ":2match" and ":3match" we need to skip the number. // For ":2match" and ":3match" we need to skip the number.
ea.cmd = (char *)((*name == '2' || *name == '3') ? name + 1 : name); ea.cmd = (char *)((*name == '2' || *name == '3') ? name + 1 : name);
ea.cmdidx = (cmdidx_T)0; ea.cmdidx = (cmdidx_T)0;
ea.flags = 0;
int full = false; int full = false;
p = find_ex_command(&ea, &full); p = find_ex_command(&ea, &full);
if (p == NULL) { if (p == NULL) {
@@ -3288,6 +3289,7 @@ int cmd_exists(const char *const name)
/// "fullcommand" function /// "fullcommand" function
void f_fullcommand(typval_T *argvars, typval_T *rettv, FunPtr fptr) void f_fullcommand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
exarg_T ea;
char *name = argvars[0].vval.v_string; char *name = argvars[0].vval.v_string;
rettv->v_type = VAR_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); name = skip_range(name, NULL);
exarg_T ea = { ea.cmd = (*name == '2' || *name == '3') ? name + 1 : name;
.cmd = (*name == '2' || *name == '3') ? name + 1 : name, ea.cmdidx = (cmdidx_T)0;
.cmdidx = (cmdidx_T)0, ea.flags = 0;
};
char *p = find_ex_command(&ea, NULL); char *p = find_ex_command(&ea, NULL);
if (p == NULL || ea.cmdidx == CMD_SIZE) { if (p == NULL || ea.cmdidx == CMD_SIZE) {
return; return;