diff options
| author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2018-02-19 17:26:33 +0000 |
|---|---|---|
| committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2018-02-19 17:26:33 +0000 |
| commit | ea6f7a508aaa2fd61eb60d7759fe00713f46cd5c (patch) | |
| tree | 5e69798e3545ef661c3c7f997cc4a620dd72fa4b /src/pcre2_match.c | |
| parent | e3ac8929b8152e6a30eff90f791b76339e44d91b (diff) | |
| download | pcre2-ea6f7a508aaa2fd61eb60d7759fe00713f46cd5c.tar.gz | |
Fix \C bug with repeated character classes in UTF-8 mode.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@918 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2_match.c')
| -rw-r--r-- | src/pcre2_match.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/pcre2_match.c b/src/pcre2_match.c index 79cc93f..ce96016 100644 --- a/src/pcre2_match.c +++ b/src/pcre2_match.c @@ -1962,11 +1962,15 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ + /* After \C in UTF mode, Lstart_eptr might be in the middle of a + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ + for (;;) { RMATCH(Fecode, RM201); if (rrc != MATCH_NOMATCH) RRETURN(rrc); - if (Feptr-- == Lstart_eptr) break; /* Tried at original position */ + if (Feptr-- <= Lstart_eptr) break; /* Tried at original position */ BACKCHAR(Feptr); } } @@ -2126,11 +2130,15 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ + /* After \C in UTF mode, Lstart_eptr might be in the middle of a + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ + for(;;) { RMATCH(Fecode, RM101); if (rrc != MATCH_NOMATCH) RRETURN(rrc); - if (Feptr-- == Lstart_eptr) break; /* Tried at original position */ + if (Feptr-- <= Lstart_eptr) break; /* Tried at original position */ #ifdef SUPPORT_UNICODE if (utf) BACKCHAR(Feptr); #endif @@ -4002,8 +4010,8 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ /* After \C in UTF mode, Lstart_eptr might be in the middle of a - Unicode character. Use <= pp to ensure backtracking doesn't go too far. - */ + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ for(;;) { |