diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-04-06 21:34:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-04-06 21:34:04 +0200 |
| commit | acff47b0bc569f05dddfb857bb4697c7db9bfa10 (patch) | |
| tree | 745ee9c3620c885d8010620eb1b9092c26a5fb95 | |
| parent | 292e2abc3741aceefb32b7247c6b0ddbed826c77 (diff) | |
| download | vim-acff47b0bc569f05dddfb857bb4697c7db9bfa10.tar.gz | |
Problem: Crash when using cpp syntax file with pattern using external
match. (Havard Garnes)
Solution: Discard match when end column is before start column.
| -rw-r--r-- | src/regexp.c | 3 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/regexp.c b/src/regexp.c index 0a590f66..2c364b30 100644 --- 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, diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index afcbed47..79b7612b 100644 --- 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, diff --git a/src/version.c b/src/version.c index f0ef62c7..365ee5a9 100644 --- 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 */ /**/ + 253, +/**/ 252, /**/ 251, |