diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-28 23:04:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-28 23:04:42 +0200 |
| commit | 367562290df09285ba8565eaf8c807be5272a2af (patch) | |
| tree | c09385db36c7c697e87122939bdccdacfab968c5 | |
| parent | 23a761441efd421e79a13e93487ad81954e205d7 (diff) | |
| download | vim-367562290df09285ba8565eaf8c807be5272a2af.tar.gz | |
Problem: Using submatch() may crash Vim. (Ingo Karkat)
Solution: Restore the number of subexpressions used.
| -rw-r--r-- | src/regexp_nfa.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 8146d9d6..bd3818d7 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -5198,6 +5198,8 @@ nfa_regmatch(prog, start, submatch, m) || t->state->c == NFA_START_INVISIBLE_BEFORE_FIRST || t->state->c == NFA_START_INVISIBLE_BEFORE_NEG_FIRST) { + int in_use = m->norm.in_use; + /* Copy submatch info for the recursive call, so that * \1 can be matched. */ copy_sub_off(&m->norm, &t->subs.norm); @@ -5231,6 +5233,7 @@ nfa_regmatch(prog, start, submatch, m) add_here = TRUE; add_state = t->state->out1->out; } + m->norm.in_use = in_use; } else { diff --git a/src/version.c b/src/version.c index 4980ae57..d8a6f380 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1258, +/**/ 1257, /**/ 1256, |