patch 8.2.0099: use of NULL pointer when out of memory

Problem:    Use of NULL pointer when out of memory.
Solution:   Check for NULL pointer. (Dominique Pelle, closes #5449)

diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index 210b5f9819a2222db970f525785f7ccd44918d96..b5da922fd181837cc8c97ae13c59214413b6acff 100644 (file)
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -2327,7 +2327,7 @@ expand_shellcmd(
     char_u     *path = NULL;
     int                mustfree = FALSE;
     garray_T    ga;
-    char_u     *buf = alloc(MAXPATHL);
+    char_u     *buf;
     size_t     l;
     char_u     *s, *e;
     int                flags = flagsarg;
@@ -2337,12 +2337,18 @@ expand_shellcmd(
     hashitem_T *hi;
     hash_T     hash;
 
+    buf = alloc(MAXPATHL);
     if (buf == NULL)
        return FAIL;
 
-    // for ":set path=" and ":set tags=" halve backslashes for escaped
-    // space
+    // for ":set path=" and ":set tags=" halve backslashes for escaped space
     pat = vim_strsave(filepat);
+    if (pat == NULL)
+    {
+       vim_free(buf);
+       return FAIL;
+    }
+
     for (i = 0; pat[i]; ++i)
        if (pat[i] == '\\' && pat[i + 1] == ' ')
            STRMOVE(pat + i, pat + i + 1);

diff --git a/src/version.c b/src/version.c
index c466c29b243215fbe4cef89824d4bf003063f4d3..8322eb31de3565b954b508a2e2f77b98b4fb4be5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    99,
 /**/
     98,
 /**/