Mercurial > vim
changeset 21473:8bcd1ee2630b v8.2.1287
patch 8.2.1287: Vim9: crash when using an imported function
Commit: https://github.com/vim/vim/commit/40f4f7a48cae491f83bd3cdbf7e9b5a23ed870ef
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jul 23 22:41:43 2020 +0200
patch 8.2.1287: Vim9: crash when using an imported function
Problem: Vim9: crash when using an imported function.
Solution: Add the function type to the imported entry. (closes https://github.com/vim/vim/issues/6522)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 23 Jul 2020 22:45:04 +0200 |
| parents | d17bb9011c44 |
| children | 0a87961c9226 |
| files | src/testdir/test_vim9_script.vim src/version.c src/vim9compile.c src/vim9script.c |
| diffstat | 4 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -912,6 +912,12 @@ def Test_vim9_import_export() g:imported_added = exported g:imported_func = Exported() + def GetExported(): string + let local_dict = #{ref: Exported} + return local_dict.ref() + enddef + g:funcref_result = GetExported() + import {exp_name} from './Xexport.vim' g:imported_name = exp_name exp_name ..= ' Doe' @@ -930,6 +936,7 @@ def Test_vim9_import_export() assert_equal(9879, g:imported_added) assert_equal(9879, g:imported_later) assert_equal('Exported', g:imported_func) + assert_equal('Exported', g:funcref_result) assert_equal('John', g:imported_name) assert_equal('John Doe', g:imported_name_appended) assert_false(exists('g:name'))
--- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1287, +/**/ 1286, /**/ 1285,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -714,7 +714,7 @@ generate_instr_type(cctx_T *cctx, isntyp if (ga_grow(stack, 1) == FAIL) return NULL; - ((type_T **)stack->ga_data)[stack->ga_len] = type; + ((type_T **)stack->ga_data)[stack->ga_len] = type == NULL ? &t_any : type; ++stack->ga_len; return isn; @@ -1178,7 +1178,7 @@ generate_PUSHFUNC(cctx_T *cctx, char_u * RETURN_OK_IF_SKIP(cctx); if ((isn = generate_instr_type(cctx, ISN_PUSHFUNC, type)) == NULL) return FAIL; - isn->isn_arg.string = name; + isn->isn_arg.string = name == NULL ? NULL : vim_strsave(name); return OK; } @@ -2807,14 +2807,13 @@ compile_load_scriptvar( idx, type); } + else if (import->imp_funcname != NULL) + generate_PUSHFUNC(cctx, import->imp_funcname, import->imp_type); else - { - // TODO: check this is a variable, not a function? generate_VIM9SCRIPT(cctx, ISN_LOADSCRIPT, import->imp_sid, import->imp_var_vals_idx, import->imp_type); - } return OK; } @@ -2835,8 +2834,7 @@ generate_funcref(cctx_T *cctx, char_u *n if (ufunc->uf_def_status == UF_TO_BE_COMPILED) if (compile_def_function(ufunc, TRUE, NULL) == FAIL) return FAIL; - return generate_PUSHFUNC(cctx, vim_strsave(ufunc->uf_name), - ufunc->uf_func_type); + return generate_PUSHFUNC(cctx, ufunc->uf_name, ufunc->uf_func_type); } /*