Commit: patch 9.1.0812: Coverity warns about dereferencing NULL ptr

[Christian Brabandt]

patch 9.1.0812: Coverity warns about dereferencing NULL ptr

Commit: https://github.com/vim/vim/commit/d0809869d6445faecd323fb33dc271d8c74a94fb
Author: Christian Brabandt <c...@256bit.org>
Date: Wed Oct 23 21:32:31 2024 +0200

patch 9.1.0812: Coverity warns about dereferencing NULL ptr

Problem: Coverity warns about dereferencing NULL ptr
in check_colorcolumn()
Solution: verify that wp is not null before accessing it

related: #15914

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/version.c b/src/version.c
index 226a05eed..1f66cef8a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 812,
/**/
811,
/**/
diff --git a/src/window.c b/src/window.c
index 5a8dc2e9e..7c8f4fb36 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7934,7 +7934,7 @@ check_colorcolumn(
char_u *cc, // when NULL: use "wp->w_p_cc"
win_T *wp) // when NULL: only parse "cc"
{
- char_u *s;
+ char_u *s = empty_option;
int tw;
int col;
int count = 0;
@@ -7947,7 +7947,7 @@ check_colorcolumn(

if (cc != NULL)
s = cc;
- else
+ else if (wp != NULL)
s = wp->w_p_cc;

if (wp != NULL)