thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1707: Coverity warns for possibly using a NULL pointer

Browse Source 
Problem:    Coverity warns for possibly using a NULL pointer.
Solution:   Change the logic to make sure no NULL pointer is used.
This commit is contained in:
Bram Moolenaar
2019-07-17 21:27:52 +02:00
parent 99a764bccd
commit cfdbc5adde
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/popupwin.c
View File

@@ -587,14 +587,13 @@ apply_general_options(win_T *wp, dict_T *dict)
di = dict_find(dict, (char_u *)"mask", -1); di = dict_find(dict, (char_u *)"mask", -1);
if (di != NULL) if (di != NULL)
{ {
int ok = TRUE; int ok = FALSE;
if (di->di_tv.v_type != VAR_LIST) if (di->di_tv.v_type == VAR_LIST && di->di_tv.vval.v_list != NULL)
ok = FALSE;
else if (di->di_tv.vval.v_list != NULL)
{ {
listitem_T *li; listitem_T *li;
ok = TRUE;
for (li = di->di_tv.vval.v_list->lv_first; li != NULL; for (li = di->di_tv.vval.v_list->lv_first; li != NULL;
li = li->li_next) li = li->li_next)
{ {

4
src/testdir/test_popupwin.vim
View File

@@ -643,6 +643,10 @@ func Test_popup_invalid_arguments()
call popup_clear() call popup_clear()
call assert_fails('call popup_create([#{text: "text", props: ["none"]}], {})', 'E715:') call assert_fails('call popup_create([#{text: "text", props: ["none"]}], {})', 'E715:')
call popup_clear() call popup_clear()
call assert_fails('call popup_create("text", #{mask: ["asdf"]})', 'E475:')
call popup_clear()
call assert_fails('call popup_create("text", #{mask: test_null_list()})', 'E475:')
call popup_clear()
endfunc endfunc
func Test_win_execute_closing_curwin() func Test_win_execute_closing_curwin()

2
src/version.c
View File

@@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1707,
/**/ /**/
1706, 1706,
/**/ /**/