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.

diff --git a/src/beval.c b/src/beval.c
index 63aaf1376c1c55f34b1c45e33979a3f8888a378c..6b10a654d8557c822a17f0e592bc9cae28442795 100644 (file)
--- 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;

diff --git a/src/popupwin.c b/src/popupwin.c
index 3a0dcb96aaccdd3f4cef68280e0bb8b744e19071..608db4c0962516a4a61a1ca9acca90084d5eb7a0 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -798,16 +798,16 @@ apply_general_options(win_T *wp, dict_T *dict)
                    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];
+               }
            }
        }
     }

diff --git a/src/version.c b/src/version.c
index 34553c60a6027fb030a90f24e0f93512bac82830..122dcc881b8a71f391db268cdb66f7d0c1d04383 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    510,
 /**/
     509,
 /**/