From 8b7aa2f9b238df916c161cdacda032c25d72a0ae Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 7 Jan 2020 21:05:49 +0100 Subject: [PATCH] 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) --- src/cmdexpand.c | 12 +++++++++--- src/version.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 210b5f981..b5da922fd 100644 --- 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 c466c29b2..8322eb31d 100644 --- 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, /**/ -- 2.40.0