diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-07 22:12:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-07 22:12:19 +0200 |
| commit | 6853c38b78fe5333f95470e1ff3ca6741247e600 (patch) | |
| tree | f1cb34af0b184966d3f23297e9d3726b2e43ba03 | |
| parent | 89a54b413a8c96206ce7e038dde81a6eff6cd6b8 (diff) | |
patch 8.2.3411: Vim9: crash when using base name of importv8.2.3411
Problem: Vim9: crash when using base name of import. (Naohiro Ono)
Solution: Check the import flags. (closes #8843)
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/evalvars.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 25 insertions, 0 deletions
diff --git a/src/errors.h b/src/errors.h index b4c111d3f1..dd72a74a9d 100644 --- a/src/errors.h +++ b/src/errors.h @@ -654,3 +654,5 @@ EXTERN char e_legacy_must_be_followed_by_command[] INIT(= N_("E1234: legacy must be followed by a command")); EXTERN char e_function_reference_is_not_set[] INIT(= N_("E1235: Function reference is not set")); +EXTERN char e_cannot_use_str_itself_it_is_imported_with_star[] + INIT(= N_("E1236: Cannot use %s itself, it is imported with '*'")); diff --git a/src/evalvars.c b/src/evalvars.c index 1af9ec5628..5a26effbb3 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -3260,6 +3260,12 @@ set_var_const( semsg(_(e_redefining_imported_item_str), name); goto failed; } + if (import->imp_flags & IMP_FLAGS_STAR) + { + semsg(_(e_cannot_use_str_itself_it_is_imported_with_star), + name); + goto failed; + } sv = ((svar_T *)si->sn_var_vals.ga_data) + import->imp_var_vals_idx; where.wt_variable = TRUE; diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index cdbf914ab7..8341ef192b 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1477,6 +1477,21 @@ def Test_vim9_import_export() delete('Xvim9_script') enddef +def Test_import_star_fails() + writefile([], 'Xfoo.vim') + var lines =<< trim END + import * as foo from '/tmp/foo.vim' + foo = 'bar' + END + CheckDefAndScriptFailure2(lines, 'E1094:', 'E1236: Cannot use foo itself') + lines =<< trim END + vim9script + import * as foo from '/tmp/foo.vim' + var that = foo + END + CheckScriptFailure(lines, 'E1029: Expected ''.''') +enddef + def Test_import_as() var export_lines =<< trim END vim9script diff --git a/src/version.c b/src/version.c index 979c039baf..e5facbaa52 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3411, +/**/ 3410, /**/ 3409, |