diff options
author | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-09-15 14:36:23 +0000 |
---|---|---|
committer | ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069> | 2020-09-15 14:36:23 +0000 |
commit | c23be766617cbfcb14e56dc5f1f01289077bd125 (patch) | |
tree | 4eb913409fb7da41356a1edaf016e9ea46812114 /src | |
parent | 075c6e67db068685a87233580579fccecfb7f27a (diff) | |
download | pcre2-c23be766617cbfcb14e56dc5f1f01289077bd125.tar.gz |
Fix Bugzilla #2642: no match bug in 8-bit mode for caseless invalid utf
matching.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1272 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src')
-rw-r--r-- | src/pcre2_match.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/pcre2_match.c b/src/pcre2_match.c index 11289d5..3372410 100644 --- a/src/pcre2_match.c +++ b/src/pcre2_match.c @@ -6115,8 +6115,8 @@ BOOL has_req_cu = FALSE; BOOL startline; #if PCRE2_CODE_UNIT_WIDTH == 8 -BOOL memchr_not_found_first_cu = FALSE; -BOOL memchr_not_found_first_cu2 = FALSE; +BOOL memchr_not_found_first_cu; +BOOL memchr_not_found_first_cu2; #endif PCRE2_UCHAR first_cu = 0; @@ -6709,6 +6709,11 @@ FRAGMENT_RESTART: start_partial = match_partial = NULL; mb->hitend = FALSE; +#if PCRE2_CODE_UNIT_WIDTH == 8 +memchr_not_found_first_cu = FALSE; +memchr_not_found_first_cu2 = FALSE; +#endif + for(;;) { PCRE2_SPTR new_start_match; @@ -7187,6 +7192,7 @@ if (utf && end_subject != true_end_subject && starting code units in 8-bit and 16-bit modes. */ start_match = end_subject + 1; + #if PCRE2_CODE_UNIT_WIDTH != 32 while (start_match < true_end_subject && NOT_FIRSTCU(*start_match)) start_match++; |