summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-27 21:27:03 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-27 21:27:03 +0100
commit06d626032330dc79825004f9cba7d154c9c90cbc (patch)
treeec368f4aa7ac4698575feea84e3b1b9900dbb5cd
parent6436cd83f90a0efc326798792e49e8ff96a43dce (diff)
patch 8.1.0645: Coverity warns for possible use of NULL pointerv8.1.0645
Problem: Coverity warns for possible use of NULL pointer. Solution: Check return value of vterm_obtain_screen().
-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 1875cc3e34..d030f6d70b 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -5060,6 +5060,8 @@ f_term_scrape(typval_T *argvars, typval_T *rettv)
if (term->tl_vterm != NULL)
{
screen = vterm_obtain_screen(term->tl_vterm);
+ if (screen == NULL) // can't really happen
+ return;
p = NULL;
line = NULL;
}
diff --git a/src/version.c b/src/version.c
index cec9bc66a6..823db356f3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 645,
+/**/
644,
/**/
643,