mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-14 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.0392: Coverity warns for using array index out of range

Browse Source 
Problem:    Coverity warns for using array index out of range.
Solution:   Add extra "if" to avoid warning.
56cb337872
This commit is contained in:
zeertzjq
2022-08-05 06:26:35 +08:00
parent 77926b6493
commit 93649cefab
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/menu.c
View File

@@ -1913,16 +1913,18 @@ static void menuitem_getinfo(const vimmenu_T *menu, int modes, dict_T *dict)
// Get the first mode in which the menu is available
for (bit = 0; (bit < MENU_MODES) && !((1 << bit) & modes); bit++) {}
if (menu->strings[bit] != NULL) {
tv_dict_add_allocated_str(dict, S_LEN("rhs"),
*menu->strings[bit] == NUL
? xstrdup("<Nop>")
: str2special_save(menu->strings[bit], false, false));
if (bit < MENU_MODES) { // just in case, avoid Coverity warning
if (menu->strings[bit] != NULL) {
tv_dict_add_allocated_str(dict, S_LEN("rhs"),
*menu->strings[bit] == NUL
? xstrdup("<Nop>")
: str2special_save(menu->strings[bit], false, false));
}
tv_dict_add_bool(dict, S_LEN("noremenu"), menu->noremap[bit] == REMAP_NONE);
tv_dict_add_bool(dict, S_LEN("script"), menu->noremap[bit] == REMAP_SCRIPT);
tv_dict_add_bool(dict, S_LEN("silent"), menu->silent[bit]);
tv_dict_add_bool(dict, S_LEN("enabled"), (menu->enabled & (1 << bit)) != 0);
}
tv_dict_add_bool(dict, S_LEN("noremenu"), menu->noremap[bit] == REMAP_NONE);
tv_dict_add_bool(dict, S_LEN("script"), menu->noremap[bit] == REMAP_SCRIPT);
tv_dict_add_bool(dict, S_LEN("silent"), menu->silent[bit]);
tv_dict_add_bool(dict, S_LEN("enabled"), (menu->enabled & (1 << bit)) != 0);
} else {
// If there are submenus, add all the submenu display names
list_T *const l = tv_list_alloc(kListLenMayKnow);