Mercurial > vim

comparison src/popupwin.c @ 17417:aa4532c1d001 v8.1.1707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1707: Coverity warns for possibly using a NULL pointer commit https://github.com/vim/vim/commit/cfdbc5adde49cbab939e8164555ed0b8d9ce000b Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jul 17 21:27:52 2019 +0200 patch 8.1.1707: Coverity warns for possibly using a NULL pointer Problem: Coverity warns for possibly using a NULL pointer. Solution: Change the logic to make sure no NULL pointer is used.
author Bram Moolenaar <Bram@vim.org>
date Wed, 17 Jul 2019 21:30:04 +0200
parents b18fd36fdf46
children 73e81cd9e6cb
comparison
equal deleted inserted replaced
17416:2a82ba1d2dd9 17417:aa4532c1d001
585 } 585 }
586 586
587 di = dict_find(dict, (char_u *)"mask", -1); 587 di = dict_find(dict, (char_u *)"mask", -1);
588 if (di != NULL) 588 if (di != NULL)
589 { 589 {
590 int ok = TRUE; 590 int ok = FALSE;
591 591
592 if (di->di_tv.v_type != VAR_LIST) 592 if (di->di_tv.v_type == VAR_LIST && di->di_tv.vval.v_list != NULL)
593 ok = FALSE;
594 else if (di->di_tv.vval.v_list != NULL)
595 { 593 {
596 listitem_T *li; 594 listitem_T *li;
597 595
596 ok = TRUE;
598 for (li = di->di_tv.vval.v_list->lv_first; li != NULL; 597 for (li = di->di_tv.vval.v_list->lv_first; li != NULL;
599 li = li->li_next) 598 li = li->li_next)
600 { 599 {
601 if (li->li_tv.v_type != VAR_LIST 600 if (li->li_tv.v_type != VAR_LIST
602 || li->li_tv.vval.v_list == NULL 601 || li->li_tv.vval.v_list == NULL