summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-03-31 11:51:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-03-31 11:51:21 +0100
commit49d008d96b80d17e9770b066031aaaf9495761e2 (patch)
treef63fddee7914fd3f2c6c60b148c14b928bcfe4a4
parent4dea2d92e4c308b064ed1dd7b2ba7527a0d6b0a0 (diff)
downloadvim-git-49d008d96b80d17e9770b066031aaaf9495761e2.tar.gz
patch 8.2.4654: missing changes for import checkv8.2.4654
Problem: Missing changes for import check. Solution: Add missing changes.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9script.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 3db4108f3..b1b976c82 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4654,
+/**/
4653,
/**/
4652,
diff --git a/src/vim9script.c b/src/vim9script.c
index 0dad36ff6..a63f2f7dd 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -399,7 +399,14 @@ handle_import_fname(char_u *fname, int is_autoload, int *sid)
{
int error = OK;
- // script does not exist yet, create a new scriptitem
+ // Script does not exist yet, check name and create a new
+ // scriptitem.
+ if (!file_is_readable(fname))
+ {
+ semsg(_(mch_isdir(fname) ? e_str_is_directory
+ : e_cannot_read_from_str_2), fname);
+ return FAIL;
+ }
*sid = get_new_scriptitem_for_fname(&error, fname);
if (error == FAIL)
return FAIL;