summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-13 19:49:26 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-13 19:49:26 +0200
commit53efb18530cc3940d7af2ea338947783ea5495ed (patch)
tree55964df96711eb5a518f5a9b0129bff9eb5098e4
parent1e7b52ad8a5e34b9e7a2d12a09765d76d446cd5a (diff)
downloadvim-git-53efb18530cc3940d7af2ea338947783ea5495ed.tar.gz
patch 8.1.2147: crash when allocating memory failsv8.1.2147
Problem: Crash when allocating memory fails. (Zu-Ming Jiang) Solution: Check that 'spellcapcheck' is not NULL. (closes #5048)
-rw-r--r--src/spell.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/spell.c b/src/spell.c
index 607bb392e..04e4af601 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -4367,7 +4367,7 @@ compile_cap_prog(synblock_T *synblock)
regprog_T *rp = synblock->b_cap_prog;
char_u *re;
- if (*synblock->b_p_spc == NUL)
+ if (synblock->b_p_spc == NULL || *synblock->b_p_spc == NUL)
synblock->b_cap_prog = NULL;
else
{
diff --git a/src/version.c b/src/version.c
index a6a9439fe..3dc64cc08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2147,
+/**/
2146,
/**/
2145,