Mercurial > vim
changeset 1074:a112fdce9ebd v7.0.200
updated for version 7.0-200
| author | vimboss |
|---|---|
| date | Tue, 20 Feb 2007 02:49:19 +0000 |
| parents | ec7a570696ac |
| children | 21ce954cbdca |
| files | src/diff.c src/edit.c src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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];
--- a/src/edit.c +++ b/src/edit.c @@ -2698,6 +2698,7 @@ ins_compl_dictionaries(dict_start, pat, 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, 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);