From 4d9ae21a342a3c81913e9f41b362778989b0c564 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 28 Jun 2013 23:04:42 +0200 Subject: updated for version 7.3.1258 Problem: Using submatch() may crash Vim. (Ingo Karkat) Solution: Restore the number of subexpressions used. --- src/regexp_nfa.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 8146d9d61..bd3818d71 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 4980ae570..d8a6f3804 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1258, /**/ 1257, /**/ -- cgit v1.2.3