updated for version 7.0-200

diff --git a/src/diff.c b/src/diff.c
index 22cf5af0d200d9f5633b7c3beafaeafd682dacfd..daa1f19c2d54daad356adfd1e8aa0b0652c9aeb4 100644 (file)
--- a/src/diff.c
+++ b/src/diff.c
@@ -1822,14 +1822,20 @@ diff_find_change(wp, lnum, startp, endp)
 
     idx = diff_buf_idx(wp->w_buffer);
     if (idx == DB_COUNT)       /* cannot happen */
+    {
+       vim_free(line_org);
        return FALSE;
+    }
 
     /* search for a change that includes "lnum" in the list of diffblocks. */
     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
        if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
            break;
     if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
+    {
+       vim_free(line_org);
        return FALSE;
+    }
 
     off = lnum - dp->df_lnum[idx];
 

diff --git a/src/edit.c b/src/edit.c
index b0e6f45d12784773f55dd0d87c92a3e7237b1825..25a76a2792fa682f4003f664e282136e2eb9bf16 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -2698,6 +2698,7 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus)
     buf = alloc(LSIZE);
     if (buf == NULL)
        return;
+    regmatch.regprog = NULL;   /* so that we can goto theend */
 
     /* If 'infercase' is set, don't use 'smartcase' here */
     save_p_scs = p_scs;
@@ -2712,13 +2713,13 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus)
        char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
 
        if (pat_esc == NULL)
-           return ;
+           goto theend ;
        i = (int)STRLEN(pat_esc) + 10;
        ptr = alloc(i);
        if (ptr == NULL)
        {
            vim_free(pat_esc);
-           return;
+           goto theend;
        }
        vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
        regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);

diff --git a/src/version.c b/src/version.c
index 42138ca9b057db3d7863f083676261bb277732ff..c8c8834f4394e4d2e75931bbd4b5de2db3e69312 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    200,
 /**/
     199,
 /**/