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 4db302714abc3a952db7298aed322012cbe0a277..977d83802be4499b2fadc4def988e21016adf601 100644 (file)
--- 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 d0e649c33c5e38076d911dd9aa5057270c10759d..d67e8d845fc741d88db8200ecee40cc27ac62001 100644 (file)
--- 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,
 /**/