updated for version 7.4.334

Problem:    Unitialized variables, causing some problems.
Solution:   Initialize the variables. (Dominique Pelle)

diff --git a/src/screen.c b/src/screen.c
index e0fbbb463125cda30433982b9db5a4d5e565773b..872ef08a5a06cdc05709eee84ca379a1de65eb68 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -7363,7 +7363,7 @@ next_search_hl(win, shl, lnum, mincol, cur)
     match_T        *shl;       /* points to search_hl or a match */
     linenr_T       lnum;
     colnr_T        mincol;     /* minimal column for a match */
-    matchitem_T            *cur;       /* to retrieve match postions if any */
+    matchitem_T            *cur;       /* to retrieve match positions if any */
 {
     linenr_T   l;
     colnr_T    matchcol;
@@ -7458,9 +7458,9 @@ next_search_hl(win, shl, lnum, mincol, cur)
            }
        }
        else if (cur != NULL)
-       {
            nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol);
-       }
+       else
+           nmatched = 0;
        if (nmatched == 0)
        {
            shl->lnum = 0;              /* no match found */

diff --git a/src/version.c b/src/version.c
index 300dedbb02278e8047f8e2634ea36aca81390997..bf8567a9e58b5b3a648c0d6c321981913136d5f8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    334,
 /**/
     333,
 /**/

diff --git a/src/window.c b/src/window.c
index f76812a0ea904d8eac1279494820a673a147e2fa..ae82fe7db5f0f14cd8d0a1989b4dbd6509d93c13 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -6809,7 +6809,7 @@ match_add(wp, grp, pat, prio, id, pos_list)
     }
 
     /* Build new match. */
-    m = (matchitem_T *)alloc(sizeof(matchitem_T));
+    m = (matchitem_T *)alloc_clear(sizeof(matchitem_T));
     m->id = id;
     m->priority = prio;
     m->pattern = pat == NULL ? NULL : vim_strsave(pat);
@@ -6835,7 +6835,7 @@ match_add(wp, grp, pat, prio, id, pos_list)
            int         len = 1;
            list_T      *subl;
            listitem_T  *subli;
-           int         error;
+           int         error = FALSE;
 
            if (li == NULL)
            {