From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 21 Sep 2011 11:40:17 +0000 (+0200)
Subject: updated for version 7.3.316
X-Git-Tag: v7.3.316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50f834dfb2a06e7e5ecf937bc32d6d711e5883a5;p=vim

updated for version 7.3.316
Problem:    Crash when 'colorcolumn' is set and closing buffer.
Solution:   Check for w_buffer to be NULL. (Yasuhiro Matsumoto)
---

diff --git a/src/option.c b/src/option.c
index 4db302714..977d83802 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7036,6 +7036,9 @@ check_colorcolumn(wp)
     int		i;
     int		j = 0;
 
+    if (wp->w_buffer == NULL)
+	return NULL;  /* buffer was closed */
+
     for (s = wp->w_p_cc; *s != NUL && count < 255;)
     {
 	if (*s == '-' || *s == '+')
diff --git a/src/version.c b/src/version.c
index d0e649c33..d67e8d845 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    316,
 /**/
     315,
 /**/