0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 9.1.1041: Vim9: out-of-bound access when echoing an enum

Problem:  Vim9: out-of-bound access when echoing an enum
Solution: Add NUL to growarray, check that ufunc is non-null
          before accessing it to make Coverity happy
          (Yegappan Lakshmanan)

closes: #16488

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-01-20 21:38:09 +01:00
committed by Christian Brabandt
parent d79ea47079
commit cb848b687f
4 changed files with 19 additions and 1 deletions

View File

@@ -1586,4 +1586,19 @@ def Test_lambda_block_in_enum()
v9.CheckScriptSuccess(lines) v9.CheckScriptSuccess(lines)
enddef enddef
" Echo an enum
def Test_enum_echo()
var lines =<< trim END
vim9script
enum Demo
one('tahi'),
two('rua'),
three('toru')
var alias: string
endenum
assert_equal('enum Demo.one {name: one, ordinal: 0, alias: tahi}', execute('echo Demo.one')->split("\n")[0])
END
v9.CheckScriptSuccess(lines)
enddef
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

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 */
/**/
1041,
/**/ /**/
1040, 1040,
/**/ /**/

View File

@@ -4054,6 +4054,7 @@ object2string(
vim_free(ga.ga_data); vim_free(ga.ga_data);
return NULL; return NULL;
} }
ga_append(&ga, NUL);
return (char_u *)ga.ga_data; return (char_u *)ga.ga_data;
} }

View File

@@ -406,7 +406,7 @@ compile_class_object_index(cctx_T *cctx, char_u **arg, type_T *type)
} }
} }
if (is_super && IS_ABSTRACT_METHOD(ufunc)) if (is_super && ufunc != NULL && IS_ABSTRACT_METHOD(ufunc))
{ {
// Trying to invoke an abstract method in a super class is not // Trying to invoke an abstract method in a super class is not
// allowed. // allowed.