IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0261: Coverity complains about a negative array index

Browse Source 
Problem:    Coverity complains about a negative array index.
Solution:   When qf_id2nr() cannot find the list then don't set qf_curlist.
38efd1d17a
This commit is contained in:
Jan Edmund Lazo 2019-09-13 01:18:00 -04:00
parent fba9c72495
commit 47357270ae
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/nvim/quickfix.c
View File

@ -3456,14 +3456,27 @@ static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
return INVALID_QFIDX; return INVALID_QFIDX;
} }
// If the current list is not "save_qfid" and we can find the list with that ID
// then make it the current list.
// This is used when autocommands may have changed the current list.
static void qf_restore_list(qf_info_T *qi, unsigned save_qfid)
FUNC_ATTR_NONNULL_ALL
{
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) {
const int curlist = qf_id2nr(qi, save_qfid);
if (curlist >= 0) {
qi->qf_curlist = curlist;
}
// else: what if the list can't be found?
}
}
// Jump to the first entry if there is one. // Jump to the first entry if there is one.
static void qf_jump_first(qf_info_T *qi, unsigned save_qfid, int forceit) static void qf_jump_first(qf_info_T *qi, unsigned save_qfid, int forceit)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
// If autocommands changed the current list, then restore it qf_restore_list(qi, save_qfid);
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) {
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
// Autocommands might have cleared the list, check for it // Autocommands might have cleared the list, check for it
if (!qf_list_empty(qi, qi->qf_curlist)) { if (!qf_list_empty(qi, qi->qf_curlist)) {
qf_jump(qi, 0, 0, forceit); qf_jump(qi, 0, 0, forceit);
@ -4038,11 +4051,7 @@ static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
return true; return true;
} }
} }
if (qi->qf_lists[qi->qf_curlist].qf_id != qfid) { qf_restore_list(qi, qfid);
// Autocommands changed the quickfix list. Find the one we were using
// and restore it.
qi->qf_curlist = qf_id2nr(qi, qfid);
}
return true; return true;
} }
@ -4338,10 +4347,7 @@ void ex_vimgrep(exarg_T *eap)
goto theend; goto theend;
} }
// If autocommands changed the current list, then restore it. qf_restore_list(qi, save_qfid);
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) {
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
/* Jump to first match. */ /* Jump to first match. */
if (qi->qf_lists[qi->qf_curlist].qf_count > 0) { if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
@ -4641,9 +4647,7 @@ static int qf_get_list_from_lines(dict_T *what, dictitem_T *di, dict_T *retdict)
} }
list_T *l = tv_list_alloc(kListLenMayKnow); list_T *l = tv_list_alloc(kListLenMayKnow);
qf_info_T *qi = xmalloc(sizeof(*qi)); qf_info_T *const qi = ll_new_list();
memset(qi, 0, sizeof(*qi));
qi->qf_refcount++;
if (qf_init_ext(qi, 0, NULL, NULL, &di->di_tv, errorformat, if (qf_init_ext(qi, 0, NULL, NULL, &di->di_tv, errorformat,
true, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0) { true, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0) {