From 67def64a4e4590a5f3b55ebfc33c42a3dcd7b559 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 24 Oct 2020 20:58:06 +0200
Subject: [PATCH] patch 8.2.1899: crash in out-of-memory situation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Problem:    Crash in out-of-memory situation.
Solution:   Bail out if shell_name is NULL. (Dominique Pellé, closes #7196)
---
 src/ex_cmds.c | 3 +++
 src/version.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 1dbd01494..82e9c577a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1544,6 +1544,9 @@ make_filter_cmd(
     int		is_fish_shell;
     char_u	*shell_name = get_isolated_shell_name();
 
+    if (shell_name == NULL)
+	return NULL;
+
     // Account for fish's different syntax for subshells
     is_fish_shell = (fnamecmp(shell_name, "fish") == 0);
     vim_free(shell_name);
diff --git a/src/version.c b/src/version.c
index ba9c8162b..b4c658255 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1899,
 /**/
     1898,
 /**/
-- 
2.50.1