thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.1.0812: Coverity warns about dereferencing NULL ptr

Browse Source 
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 <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2024-10-23 21:32:31 +02:00
parent 2f6efaccfd
commit d0809869d6
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
812,
/**/ /**/
811, 811,
/**/ /**/

4
src/window.c
View File

@ -7934,7 +7934,7 @@ check_colorcolumn(
char_u *cc, // when NULL: use "wp->w_p_cc" char_u *cc, // when NULL: use "wp->w_p_cc"
win_T *wp) // when NULL: only parse "cc" win_T *wp) // when NULL: only parse "cc"
{ {
char_u *s; char_u *s = empty_option;
int tw; int tw;
int col; int col;
int count = 0; int count = 0;
@ -7947,7 +7947,7 @@ check_colorcolumn(
if (cc != NULL) if (cc != NULL)
s = cc; s = cc;
else else if (wp != NULL)
s = wp->w_p_cc; s = wp->w_p_cc;
if (wp != NULL) if (wp != NULL)