Mercurial > vim
changeset 5820:4901a36479f2 v7.4.253
updated for version 7.4.253
Problem: Crash when using cpp syntax file with pattern using external
match. (Havard Garnes)
Solution: Discard match when end column is before start column.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 06 Apr 2014 21:34:04 +0200 |
| parents | 33629aae4090 |
| children | dd44a527c2bd |
| files | src/regexp.c src/regexp_nfa.c src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp.c +++ b/src/regexp.c @@ -4146,7 +4146,8 @@ regtry(prog, col) { /* Only accept single line matches. */ if (reg_startzpos[i].lnum >= 0 - && reg_endzpos[i].lnum == reg_startzpos[i].lnum) + && reg_endzpos[i].lnum == reg_startzpos[i].lnum + && reg_endzpos[i].col >= reg_startzpos[i].col) re_extmatch_out->matches[i] = vim_strnsave(reg_getline(reg_startzpos[i].lnum) + reg_startzpos[i].col,
--- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -6781,8 +6781,10 @@ nfa_regtry(prog, col) { struct multipos *mpos = &subs.synt.list.multi[i]; - /* Only accept single line matches. */ - if (mpos->start.lnum >= 0 && mpos->start.lnum == mpos->end.lnum) + /* Only accept single line matches that are valid. */ + if (mpos->start.lnum >= 0 + && mpos->start.lnum == mpos->end.lnum + && mpos->end.col >= mpos->start.col) re_extmatch_out->matches[i] = vim_strnsave(reg_getline(mpos->start.lnum) + mpos->start.col,