diff options
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 3f2a33a98a..5c5fd2f10d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -9439,7 +9439,7 @@ autoload_name(char_u *name) // Get the script file name: replace '#' with '/', append ".vim". scriptname = alloc(STRLEN(name) + 14); if (scriptname == NULL) - return FALSE; + return NULL; STRCPY(scriptname, "autoload/"); STRCAT(scriptname, name); for (p = scriptname + 9; (p = vim_strchr(p, AUTOLOAD_CHAR)) != NULL; @@ -9469,6 +9469,8 @@ script_autoload( return FALSE; tofree = scriptname = autoload_name(name); + if (scriptname == NULL) + return FALSE; /* Find the name in the list of previously loaded package names. Skip * "autoload/", it's always the same. */ diff --git a/src/version.c b/src/version.c index b7ceb36b43..019ce2524b 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1894, +/**/ 1893, /**/ 1892, |