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

patch 9.0.0128: Coverity complains about possible double free

Browse Source 
Problem:    Coverity complains about possible double free.
Solution:   Clear the pointer to avoid warnings.
This commit is contained in:
Bram Moolenaar
2022-08-01 12:06:40 +01:00
parent e95f22f63a
commit 3f79b61288
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/charset.c
View File

@@ -912,16 +912,13 @@ init_chartabsize_arg(
char_u *line, char_u *line,
char_u *ptr) char_u *ptr)
{ {
CLEAR_POINTER(cts);
cts->cts_win = wp; cts->cts_win = wp;
cts->cts_lnum = lnum; cts->cts_lnum = lnum;
cts->cts_vcol = col; cts->cts_vcol = col;
cts->cts_line = line; cts->cts_line = line;
cts->cts_ptr = ptr; cts->cts_ptr = ptr;
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
cts->cts_text_prop_count = 0;
cts->cts_has_prop_with_text = FALSE;
cts->cts_cur_text_width = 0;
cts->cts_with_trailing = 0;
if (lnum > 0) if (lnum > 0)
{ {
char_u *prop_start; char_u *prop_start;
@@ -951,7 +948,7 @@ init_chartabsize_arg(
if (!cts->cts_has_prop_with_text) if (!cts->cts_has_prop_with_text)
{ {
// won't use the text properties, free them // won't use the text properties, free them
vim_free(cts->cts_text_props); VIM_CLEAR(cts->cts_text_props);
cts->cts_text_prop_count = 0; cts->cts_text_prop_count = 0;
} }
} }
@@ -969,8 +966,8 @@ clear_chartabsize_arg(chartabsize_T *cts UNUSED)
#ifdef FEAT_PROP_POPUP #ifdef FEAT_PROP_POPUP
if (cts->cts_text_prop_count > 0) if (cts->cts_text_prop_count > 0)
{ {
vim_free(cts->cts_text_props); VIM_CLEAR(cts->cts_text_props);
cts->cts_text_prop_count = 0; // avoid double free cts->cts_text_prop_count = 0;
} }
#endif #endif
} }

2
src/version.c
View File

@@ -735,6 +735,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 */
/**/
128,
/**/ /**/
127, 127,
/**/ /**/