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 | 5a4e160ce423f56456227c3d7d8d8a069120b377 (patch) | |
| tree | fa2571bd998c3167055fb7cbc895b134523e8db9 | |
| parent | 7bcdb7d1669b0a37cd86446dab0c66f2e1971fa7 (diff) | |
updated for version 7.4.253v7.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.
| -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 0a590f66d7..2c364b30be 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 afcbed474e..79b7612bd9 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 f0ef62c7e2..365ee5a945 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, |