Mercurial > vim
view src/version.h @ 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 | 4635e43f2c6f |
children | c2499556f2fe |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ /* * Define the version number, name, etc. * The patchlevel is in included_patches[], in version.c. */ // Trick to turn a number into a string. #define VIM_TOSTR_(a) #a #define VIM_TOSTR(a) VIM_TOSTR_(a) // Values that change for a new release. #define VIM_VERSION_MAJOR 9 #define VIM_VERSION_MINOR 1 #define VIM_VERSION_BUILD 285 #define VIM_VERSION_BUILD_BCD 0x11d #define VIM_VERSION_DATE_ONLY "2024 Jan 02" // Values based on the above #define VIM_VERSION_MAJOR_STR VIM_TOSTR(VIM_VERSION_MAJOR) #define VIM_VERSION_MINOR_STR VIM_TOSTR(VIM_VERSION_MINOR) #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) #define VIM_VERSION_BUILD_STR VIM_TOSTR(VIM_VERSION_BUILD) #ifndef VIM_VERSION_PATCHLEVEL # define VIM_VERSION_PATCHLEVEL 0 #endif #define VIM_VERSION_PATCHLEVEL_STR VIM_TOSTR(VIM_VERSION_PATCHLEVEL) // Used by MacOS port; should be one of: development, alpha, beta, final #define VIM_VERSION_RELEASE final /* * VIM_VERSION_NODOT is used for the runtime directory name. * VIM_VERSION_SHORT is copied into the swap file (max. length is 6 chars). * VIM_VERSION_MEDIUM is used for the startup-screen. * VIM_VERSION_LONG is used for the ":version" command and "Vim -h". */ #define VIM_VERSION_NODOT "vim" VIM_VERSION_MAJOR_STR VIM_VERSION_MINOR_STR #define VIM_VERSION_SHORT VIM_VERSION_MAJOR_STR "." VIM_VERSION_MINOR_STR #define VIM_VERSION_MEDIUM VIM_VERSION_SHORT #define VIM_VERSION_LONG_ONLY "VIM - Vi IMproved " VIM_VERSION_MEDIUM #define VIM_VERSION_LONG_HEAD VIM_VERSION_LONG_ONLY " (" VIM_VERSION_DATE_ONLY #define VIM_VERSION_LONG VIM_VERSION_LONG_HEAD ")" #define VIM_VERSION_LONG_DATE VIM_VERSION_LONG_HEAD ", compiled "