adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0590: Vim9: crash when accessing getregionpos() return value

Browse Source 
Problem:  Vim9: crash when accessing getregionpos() return value.
Solution: Correct the return type (zeertzjq).

fixes: #15272
closes: #15273

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-07-16 20:34:16 +02:00
committed by Christian Brabandt
parent 03d20aaac4
commit d4d1207208
5 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/builtin.txt
View File

@ -1,4 +1,4 @@
*builtin.txt* For Vim version 9.1. Last change: 2024 Jul 11 *builtin.txt* For Vim version 9.1. Last change: 2024 Jul 16
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -4804,6 +4804,8 @@ getregion({pos1}, {pos2} [, {opts}]) *getregion()*
< <
Can also be used as a |method|: > Can also be used as a |method|: >
getpos('.')->getregion(getpos("'a")) getpos('.')->getregion(getpos("'a"))
<
Return type: list<string>
< <
getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()* getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()*
@ -4841,7 +4843,7 @@ getregionpos({pos1}, {pos2} [, {opts}]) *getregionpos()*
Can also be used as a |method|: > Can also be used as a |method|: >
getpos('.')->getregionpos(getpos("'a")) getpos('.')->getregionpos(getpos("'a"))
< <
Return type: list<string> Return type: list<list<list<number>>>
getregtype([{regname}]) *getregtype()* getregtype([{regname}]) *getregtype()*

17
src/evalfunc.c
View File

@ -1326,7 +1326,6 @@ ret_list_items(int argcount UNUSED,
*decl_type = &t_list_any; *decl_type = &t_list_any;
return &t_list_list_any; return &t_list_list_any;
} }
static type_T * static type_T *
ret_list_string_items(int argcount UNUSED, ret_list_string_items(int argcount UNUSED,
type2_T *argtypes UNUSED, type2_T *argtypes UNUSED,
@ -1336,6 +1335,14 @@ ret_list_string_items(int argcount UNUSED,
return &t_list_list_string; return &t_list_list_string;
} }
static type_T * static type_T *
ret_list_regionpos(int argcount UNUSED,
type2_T *argtypes UNUSED,
type_T **decl_type)
{
*decl_type = &t_list_any;
return &t_list_list_list_number;
}
static type_T *
ret_dict_any(int argcount UNUSED, ret_dict_any(int argcount UNUSED,
type2_T *argtypes UNUSED, type2_T *argtypes UNUSED,
type_T **decl_type UNUSED) type_T **decl_type UNUSED)
@ -1968,11 +1975,11 @@ static funcentry_T global_functions[] =
ret_number, f_diff_hlID}, ret_number, f_diff_hlID},
{"digraph_get", 1, 1, FEARG_1, arg1_string, {"digraph_get", 1, 1, FEARG_1, arg1_string,
ret_string, f_digraph_get}, ret_string, f_digraph_get},
{"digraph_getlist",0, 1, FEARG_1, arg1_bool, {"digraph_getlist", 0, 1, FEARG_1, arg1_bool,
ret_list_string_items, f_digraph_getlist}, ret_list_string_items, f_digraph_getlist},
{"digraph_set", 2, 2, FEARG_1, arg2_string, {"digraph_set", 2, 2, FEARG_1, arg2_string,
ret_bool, f_digraph_set}, ret_bool, f_digraph_set},
{"digraph_setlist",1, 1, FEARG_1, arg1_list_string, {"digraph_setlist", 1, 1, FEARG_1, arg1_list_string,
ret_bool, f_digraph_setlist}, ret_bool, f_digraph_setlist},
{"echoraw", 1, 1, FEARG_1, arg1_string, {"echoraw", 1, 1, FEARG_1, arg1_string,
ret_void, f_echoraw}, ret_void, f_echoraw},
@ -2144,8 +2151,8 @@ static funcentry_T global_functions[] =
ret_dict_any, f_getreginfo}, ret_dict_any, f_getreginfo},
{"getregion", 2, 3, FEARG_1, arg3_list_list_dict, {"getregion", 2, 3, FEARG_1, arg3_list_list_dict,
ret_list_string, f_getregion}, ret_list_string, f_getregion},
{"getregionpos", 2, 3, FEARG_1, arg3_list_list_dict, {"getregionpos", 2, 3, FEARG_1, arg3_list_list_dict,
ret_list_string, f_getregionpos}, ret_list_regionpos, f_getregionpos},
{"getregtype", 0, 1, FEARG_1, arg1_string, {"getregtype", 0, 1, FEARG_1, arg1_string,
ret_string, f_getregtype}, ret_string, f_getregtype},
{"getscriptinfo", 0, 1, 0, arg1_dict_any, {"getscriptinfo", 0, 1, 0, arg1_dict_any,

64
src/globals.h
View File

@ -519,31 +519,37 @@ EXTERN int garbage_collect_at_exit INIT(= FALSE);
#define t_list_list_any (static_types[70]) #define t_list_list_any (static_types[70])
#define t_const_list_list_any (static_types[71]) #define t_const_list_list_any (static_types[71])
#define t_list_list_string (static_types[72]) #define t_list_list_number (static_types[72])
#define t_const_list_list_string (static_types[73]) #define t_const_list_list_number (static_types[73])
#define t_dict_bool (static_types[74]) #define t_list_list_string (static_types[74])
#define t_const_dict_bool (static_types[75]) #define t_const_list_list_string (static_types[75])
#define t_dict_number (static_types[76]) #define t_list_list_list_number (static_types[76])
#define t_const_dict_number (static_types[77]) #define t_const_list_list_list_number (static_types[77])
#define t_dict_string (static_types[78]) #define t_dict_bool (static_types[78])
#define t_const_dict_string (static_types[79]) #define t_const_dict_bool (static_types[79])
#define t_super (static_types[80]) #define t_dict_number (static_types[80])
#define t_const_super (static_types[81]) #define t_const_dict_number (static_types[81])
#define t_object (static_types[82]) #define t_dict_string (static_types[82])
#define t_const_object (static_types[83]) #define t_const_dict_string (static_types[83])
#define t_class (static_types[84]) #define t_super (static_types[84])
#define t_const_class (static_types[85]) #define t_const_super (static_types[85])
#define t_typealias (static_types[86]) #define t_object (static_types[86])
#define t_const_typealias (static_types[87]) #define t_const_object (static_types[87])
EXTERN type_T static_types[88] #define t_class (static_types[88])
#define t_const_class (static_types[89])
#define t_typealias (static_types[90])
#define t_const_typealias (static_types[91])
EXTERN type_T static_types[92]
#ifdef DO_INIT #ifdef DO_INIT
= { = {
// 0: t_unknown // 0: t_unknown
@ -690,35 +696,43 @@ EXTERN type_T static_types[88]
{VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_any, NULL, NULL}, {VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_any, NULL, NULL},
{VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_any, NULL, NULL}, {VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_any, NULL, NULL},
// 72: t_list_list_string // 74: t_list_list_number
{VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_number, NULL, NULL},
{VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_number, NULL, NULL},
// 74: t_list_list_string
{VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_string, NULL, NULL}, {VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_string, NULL, NULL},
{VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_string, NULL, NULL}, {VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_string, NULL, NULL},
// 74: t_dict_bool // 76: t_list_list_list_number
{VAR_LIST, 0, 0, TTFLAG_STATIC, &t_list_list_number, NULL, NULL},
{VAR_LIST, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_list_list_number, NULL, NULL},
// 78: t_dict_bool
{VAR_DICT, 0, 0, TTFLAG_STATIC, &t_bool, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC, &t_bool, NULL, NULL},
{VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_bool, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_bool, NULL, NULL},
// 76: t_dict_number // 80: t_dict_number
{VAR_DICT, 0, 0, TTFLAG_STATIC, &t_number, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC, &t_number, NULL, NULL},
{VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_number, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_number, NULL, NULL},
// 78: t_dict_string // 82: t_dict_string
{VAR_DICT, 0, 0, TTFLAG_STATIC, &t_string, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC, &t_string, NULL, NULL},
{VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_string, NULL, NULL}, {VAR_DICT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_string, NULL, NULL},
// 80: t_super (VAR_CLASS with tt_member set to &t_bool // 84: t_super (VAR_CLASS with tt_member set to &t_bool
{VAR_CLASS, 0, 0, TTFLAG_STATIC, &t_bool, NULL, NULL}, {VAR_CLASS, 0, 0, TTFLAG_STATIC, &t_bool, NULL, NULL},
{VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_bool, NULL, NULL}, {VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_bool, NULL, NULL},
// 82: t_object // 86: t_object
{VAR_OBJECT, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL}, {VAR_OBJECT, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL},
{VAR_OBJECT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL}, {VAR_OBJECT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL},
// 84: t_class // 88: t_class
{VAR_CLASS, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL}, {VAR_CLASS, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL},
{VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL}, {VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL},
// 86: t_typealias // 90: t_typealias
{VAR_TYPEALIAS, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL}, {VAR_TYPEALIAS, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL},
{VAR_TYPEALIAS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL}, {VAR_TYPEALIAS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL},
} }

11
src/testdir/test_vim9_builtin.vim
View File

@ -1969,6 +1969,17 @@ def Test_getreginfo()
getreginfo('').regcontents->assert_equal(['D1E2F3']) getreginfo('').regcontents->assert_equal(['D1E2F3'])
enddef enddef
def Test_getregionpos()
var lines =<< trim END
cursor(1, 1)
var pos = getregionpos(getpos('.'), getpos('$'))
for p in pos
assert_equal(bufnr('%'), p[0][0])
endfor
END
v9.CheckSourceDefSuccess(lines)
enddef
def Test_getregtype() def Test_getregtype()
var lines = ['aaa', 'bbb', 'ccc'] var lines = ['aaa', 'bbb', 'ccc']
setreg('a', lines) setreg('a', lines)

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
590,
/**/ /**/
589, 589,
/**/ /**/