summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-11 14:53:30 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-11 14:53:30 +0100
commit4b7e7bed6cb16c8256e6973418701cfb15b30b8e (patch)
treee9df2dd9cd8cd20ccde9ea6b43ef54a424b9d068
parenta7e18d237f817637815f0de44b08df1e0ca0f4f9 (diff)
patch 8.0.1499: out-of-memory situation not correctly handledv8.0.1499
Problem: Out-of-memory situation not correctly handled. (Coverity) Solution: Check for NULL value.
-rw-r--r--src/terminal.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/terminal.c b/src/terminal.c
index b67cd6ceb4..6b8d35394e 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3153,6 +3153,8 @@ f_term_scrape(typval_T *argvars, typval_T *rettv)
bg = cell.bg;
}
dcell = dict_alloc();
+ if (dcell == NULL)
+ break;
list_append_dict(l, dcell);
dict_add_nr_str(dcell, "chars", 0, mbs);
diff --git a/src/version.c b/src/version.c
index 97d2390d2e..a7cc0e41ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1499,
+/**/
1498,
/**/
1497,