Mercurial > vim

diff 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
line wrap: on
line diff
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -587,14 +587,13 @@ apply_general_options(win_T *wp, dict_T 
     di = dict_find(dict, (char_u *)"mask", -1);
     if (di != NULL)
     {
-	int ok = TRUE;
+	int ok = FALSE;
 
-	if (di->di_tv.v_type != VAR_LIST)
-	    ok = FALSE;
-	else if (di->di_tv.vval.v_list != NULL)
+	if (di->di_tv.v_type == VAR_LIST && di->di_tv.vval.v_list != NULL)
 	{
 	    listitem_T *li;
 
+	    ok = TRUE;
 	    for (li = di->di_tv.vval.v_list->lv_first; li != NULL;
 							      li = li->li_next)
 	    {