mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-31 12:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0113: has() is not strict about parsing the patch version

Browse Source 
Problem:    has() is not strict about parsing the patch version.
Solution:   Check the version more strictly. (Ken Takata, closes vim/vim#10752)

d90f91fe30

Co-authored-by: K.Takata <kentkt@csc.jp>
This commit is contained in:
Jan Edmund Lazo
2025-11-29 10:34:24 -05:00
parent 0d3ee26860
commit d4a8d169a2
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/eval/funcs.c
View File

@@ -2801,18 +2801,23 @@ static void f_has(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
} else if (STRNICMP(name, "patch", 5) == 0) {
if (name[5] == '-'
&& strlen(name) >= 11
&& ascii_isdigit(name[6])
&& ascii_isdigit(name[8])
&& ascii_isdigit(name[10])) {
int major = atoi(name + 6);
int minor = atoi(name + 8);
&& (name[6] >= '1' && name[6] <= '9')) {
char *end;
// Expect "patch-9.9.01234".
n = (major < VIM_VERSION_MAJOR
|| (major == VIM_VERSION_MAJOR
&& (minor < VIM_VERSION_MINOR
|| (minor == VIM_VERSION_MINOR
&& has_vim_patch(atoi(name + 10))))));
// This works for patch-8.1.2, patch-9.0.3, patch-10.0.4, etc.
// Not for patch-9.10.5.
int major = (int)strtoul(name + 6, &end, 10);
if (*end == '.' && ascii_isdigit(end[1])
&& end[2] == '.' && ascii_isdigit(end[3])) {
int minor = atoi(end + 1);
// Expect "patch-9.9.01234".
n = (major < VIM_VERSION_MAJOR
|| (major == VIM_VERSION_MAJOR
&& (minor < VIM_VERSION_MINOR
|| (minor == VIM_VERSION_MINOR
&& has_vim_patch(atoi(end + 3))))));
}
} else if (ascii_isdigit(name[5])) {
n = has_vim_patch(atoi(name + 5));
}

9
test/old/testdir/test_expr.vim
View File

@@ -37,13 +37,22 @@ func Test_version()
call assert_true(has('patch-6.9.999'))
call assert_true(has('patch-7.1.999'))
call assert_true(has('patch-7.4.123'))
call assert_true(has('patch-7.4.123 ')) " Traling space can be allowed.
call assert_false(has('patch-7'))
call assert_false(has('patch-7.4'))
call assert_false(has('patch-7.4.'))
call assert_false(has('patch-9.1.0'))
call assert_false(has('patch-9.9.1'))
call assert_false(has('patch-abc'))
call assert_false(has('patchabc'))
call assert_false(has('patch-8x001'))
call assert_false(has('patch-9X0X0'))
call assert_false(has('patch-9-0-0'))
call assert_false(has('patch-09.0.0'))
call assert_false(has('patch-9.00.0'))
endfunc
func Test_op_ternary()