comparison src/mbyte.c @ 34854:97b5457962ed v9.1.0296

patch 9.1.0296: regexp: engines do not handle case-folding well Commit: https://github.com/vim/vim/commit/7a27c108e0509f3255ebdcb6558e896c223e4d23 Author: Christian Brabandt <cb@256bit.org> Date: Tue Apr 9 22:53:19 2024 +0200 patch 9.1.0296: regexp: engines do not handle case-folding well Problem: Regex engines do not handle case-folding well Solution: Correctly calculate byte length of characters to skip When the regexp engine compares two utf-8 codepoints case insensitively it may match an adjacent character, because it assumes it can step over as many bytes as the pattern contains. This however is not necessarily true because of case-folding, a multi-byte UTF-8 character can be considered equal to some single-byte value. Let's consider the pattern '?' and the string 's'. When comparing and ignoring case, the single character 's' matches, and since it matches Vim will try to step over the match (by the amount of bytes of the pattern), assuming that since it matches, the length of both strings is the same. However in that case, it should only step over the single byte value 's' so by 1 byte and try to start matching after it again. So for the backtracking engine we need to ensure: - we try to match the correct length for the pattern and the text - in case of a match, we step over it correctly The same thing can happen for the NFA engine, when skipping to the next character to test for a match. We are skipping over the regstart pointer, however we do not consider the case that because of case-folding we may need to adjust the number of bytes to skip over. So this needs to be adjusted in find_match_text() as well. A related issue turned out, when prog->match_text is actually empty. In that case we should try to find the next match and skip this condition. fixes: #14294 closes: #14433 Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Tue, 09 Apr 2024 23:00:08 +0200
parents 9e093c96dff6
children 3f8444c5a6f3
comparison
equal deleted inserted replaced
34853:46cbd457c74d 34854:97b5457962ed
3799 * second byte. 3799 * second byte.
3800 * Returns zero if s1 and s2 are equal (ignoring case), the difference between 3800 * Returns zero if s1 and s2 are equal (ignoring case), the difference between
3801 * two characters otherwise. 3801 * two characters otherwise.
3802 */ 3802 */
3803 int 3803 int
3804 mb_strnicmp2(char_u *s1, char_u *s2, int n1, int n2)
3805 {
3806 if (n1 == n2 || !enc_utf8)
3807 return mb_strnicmp(s1, s2, n1);
3808 else
3809 return utf_strnicmp(s1, s2, n1, n2);
3810 }
3811
3812 int
3804 mb_strnicmp(char_u *s1, char_u *s2, size_t nn) 3813 mb_strnicmp(char_u *s1, char_u *s2, size_t nn)
3805 { 3814 {
3806 int i, l; 3815 int i, l;
3807 int cdiff; 3816 int cdiff;
3808 int n = (int)nn; 3817 int n = (int)nn;