patch 8.1.1894: not checking for out-of-memory of autoload_name()

Problem:    Not checking for out-of-memory of autoload_name().
Solution:   Check for NULL. (Dominique Pelle, closes #4846)

diff --git a/src/eval.c b/src/eval.c
index 3f2a33a98a2c74d83637b695467b7d5818a5fc2b..5c5fd2f10dec32aab21ff0aeb0dd8c3648238769 100644 (file)
--- 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 b7ceb36b435727fbaf9f1769fa0c8edbd327d9d7..019ce2524b46df1ab9d7bd353d55e4a275349027 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1894,
 /**/
     1893,
 /**/