From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 27 Dec 2018 20:27:03 +0000 (+0100)
Subject: patch 8.1.0645: Coverity warns for possible use of NULL pointer
X-Git-Tag: v8.1.0645
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06d626032330dc79825004f9cba7d154c9c90cbc;p=thirdparty%2Fvim.git

patch 8.1.0645: Coverity warns for possible use of NULL pointer

Problem:    Coverity warns for possible use of NULL pointer.
Solution:   Check return value of vterm_obtain_screen().
---

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
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    645,
 /**/
     644,
 /**/