diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-08-01 18:38:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-08-01 18:38:26 +0200 |
| commit | 624247a75ab189c734a2d154d829bc30725c113d (patch) | |
| tree | 6ce35d8bfbae29bee0b8b9c31325fe9c828a199a | |
| parent | 9f973033a702a5d60e7c6e797ba85dfdfdb1e0d7 (diff) | |
| download | vim-624247a75ab189c734a2d154d829bc30725c113d.tar.gz | |
Problem: Regexp crash on pattern "@\%[\w\-]*". (Axel Kielhorn)
Solution: Add \%(\) around \%[] internally.
| -rw-r--r-- | src/regexp_nfa.c | 28 | ||||
| -rw-r--r-- | src/testdir/test64.in | 1 | ||||
| -rw-r--r-- | src/testdir/test64.ok | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 30 insertions, 4 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 738ac3bb..35b42ef9 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -1166,6 +1166,15 @@ nfa_regatom() reg_magic == MAGIC_ALL); EMIT(NFA_OPT_CHARS); EMIT(n); + + /* Emit as "\%(\%[abc]\)" to be able to handle + * "\%[abc]*" which would cause the empty string to be + * matched an unlimited number of times. NFA_NOPEN is + * added only once at a position, while NFA_SPLIT is + * added multiple times. This is more efficient than + * not allowsing NFA_SPLIT multiple times, it is used + * a lot. */ + EMIT(NFA_NOPEN); break; } @@ -1641,7 +1650,7 @@ nfa_regpiece() * engine interprets the plus as "try matching one more time", and * a* matches a second time at the end of the input, the empty * string. - * The submatch will the empty string. + * The submatch will be the empty string. * * In order to be consistent with the old engine, we replace * <atom>+ with <atom><atom>* @@ -2242,13 +2251,13 @@ nfa_postfix_dump(expr, retval) else if (retval == OK) fprintf(f, ">>> NFA engine succeeded !\n"); fprintf(f, "Regexp: \"%s\"\nPostfix notation (char): \"", expr); - for (p = post_start; *p && p < post_end; p++) + for (p = post_start; *p && p < post_ptr; p++) { nfa_set_code(*p); fprintf(f, "%s, ", code); } fprintf(f, "\"\nPostfix notation (int): "); - for (p = post_start; *p && p < post_end; p++) + for (p = post_start; *p && p < post_ptr; p++) fprintf(f, "%d ", *p); fprintf(f, "\n\n"); fclose(f); @@ -3005,7 +3014,18 @@ post2nfa(postfix, end, nfa_calc_size) { int n; - /* \%[abc] */ + /* \%[abc] implemented as: + * NFA_SPLIT + * +-CHAR(a) + * | +-NFA_SPLIT + * | +-CHAR(b) + * | | +-NFA_SPLIT + * | | +-CHAR(c) + * | | | +-next + * | | +- next + * | +- next + * +- next + */ n = *++p; /* get number of characters */ if (nfa_calc_size == TRUE) { diff --git a/src/testdir/test64.in b/src/testdir/test64.in index e666ab95..b0b1c911 100644 --- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -373,6 +373,7 @@ STARTTEST :call add(tl, [2, '\%[bar]x', 'xxx', 'x']) :call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar']) :call add(tl, [2, 'b\%[[]]r]', 'b]r bor', 'b]r']) +:call add(tl, [2, '@\%[\w\-]*', '<http://john.net/pandoc/>[@pandoc]', '@pandoc']) :" :"""" Alternatives, must use first longest match :call add(tl, [2, 'goo\|go', 'google', 'goo']) diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok index c778e9ee..2df568d9 100644 --- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -857,6 +857,9 @@ OK 2 - b\%[[ao]r] OK 0 - b\%[[]]r] OK 1 - b\%[[]]r] OK 2 - b\%[[]]r] +OK 0 - @\%[\w\-]* +OK 1 - @\%[\w\-]* +OK 2 - @\%[\w\-]* OK 0 - goo\|go OK 1 - goo\|go OK 2 - goo\|go diff --git a/src/version.c b/src/version.c index 069c172d..7ccb9315 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 */ /**/ + 4, +/**/ 3, /**/ 2, |