changeset 19908:473ceb7f65e2 v8.2.0510

patch 8.2.0510: Coverity complains about using uninitialized variable Commit: https://github.com/vim/vim/commit/8d4ed11da635a1abe0ef2d795b4d48824c54d0e7 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 4 14:50:32 2020 +0200 patch 8.2.0510: Coverity complains about using uninitialized variable Problem: Coverity complains about using uninitialized variable. Solution: Assign a value to "scol". Move code inside NULL check.
author Bram Moolenaar <Bram@vim.org>
date Sat, 04 Apr 2020 15:00:03 +0200
parents 24ec859a2130
children 3fc94c9b3113
files src/beval.c src/popupwin.c src/version.c
diffstat 3 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/beval.c
+++ b/src/beval.c
@@ -110,6 +110,8 @@ find_word_under_cursor(
 			lbuf = vim_strnsave(lbuf, len);
 		    }
 		}
+		else
+		    scol = col;
 
 		if (winp != NULL)
 		    *winp = wp;
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -798,16 +798,16 @@ apply_general_options(win_T *wp, dict_T 
 		    if (*str != NUL)
 			wp->w_border_char[i] = mb_ptr2char(str);
 		}
-	    }
-	    if (list->lv_len == 1)
-		for (i = 1; i < 8; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[0];
-	    if (list->lv_len == 2)
-	    {
-		for (i = 4; i < 8; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[1];
-		for (i = 1; i < 4; ++i)
-		    wp->w_border_char[i] = wp->w_border_char[0];
+		if (list->lv_len == 1)
+		    for (i = 1; i < 8; ++i)
+			wp->w_border_char[i] = wp->w_border_char[0];
+		if (list->lv_len == 2)
+		{
+		    for (i = 4; i < 8; ++i)
+			wp->w_border_char[i] = wp->w_border_char[1];
+		    for (i = 1; i < 4; ++i)
+			wp->w_border_char[i] = wp->w_border_char[0];
+		}
 	    }
 	}
     }
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    510,
+/**/
     509,
 /**/
     508,