Mercurial > vim

changeset 5987:03d260a8ea0c v7.4.334

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.334 Problem: Unitialized variables, causing some problems. Solution: Initialize the variables. (Dominique Pelle)
author Bram Moolenaar <bram@vim.org>
date Wed, 18 Jun 2014 21:20:11 +0200
parents 6973f595e1e9
children 70a5d1b7b485
files src/screen.c src/version.c src/window.c
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -7363,7 +7363,7 @@ next_search_hl(win, shl, lnum, mincol, c
     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, c
 	    }
 	}
 	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 */
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    334,
+/**/
     333,
 /**/
     332,
--- a/src/window.c
+++ b/src/window.c
@@ -6809,7 +6809,7 @@ match_add(wp, grp, pat, prio, id, pos_li
     }
 
     /* 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_li
 	    int		len = 1;
 	    list_T	*subl;
 	    listitem_T	*subli;
-	    int		error;
+	    int		error = FALSE;
 
 	    if (li == NULL)
 	    {