From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 1 Aug 2017 13:14:26 +0000 (+0200)
Subject: patch 8.0.0828: Coverity: may dereference NULL pointer
X-Git-Tag: v8.0.0828
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=983b3a5bc44a91cc7e40b8e71e3bfdb03dd4606f;p=vim

patch 8.0.0828: Coverity: may dereference NULL pointer

Problem:    Coverity: may dereference NULL pointer.
Solution:   Bail out if calloc_state() returns NULL.
---

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 804d742ab..40d6605f0 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3527,7 +3527,11 @@ post2nfa(int *postfix, int *end, int nfa_calc_size)
 	    {
 		/* NFA_ZEND -> NFA_END_PATTERN -> NFA_SKIP -> what follows. */
 		skip = alloc_state(NFA_SKIP, NULL, NULL);
+		if (skip == NULL)
+		    goto theend;
 		zend = alloc_state(NFA_ZEND, s1, NULL);
+		if (zend == NULL)
+		    goto theend;
 		s1->out= skip;
 		patch(e.out, zend);
 		PUSH(frag(s, list1(&skip->out)));
diff --git a/src/version.c b/src/version.c
index 732e8a526..e7b9feed9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    828,
 /**/
     827,
 /**/