Patch 8.2.3668

[Bram Moolenaar]

Patch 8.2.3668
Problem: Messages may be corrupted.
Solution: Use another buffer instead of IObuff. (Yegappan Lakshmanan,
closes #9195)
Files: src/highlight.c, src/testdir/test_highlight.vim


*** ../vim-8.2.3667/src/highlight.c 2021-11-24 16:19:41.389010087 +0000
--- src/highlight.c 2021-11-24 20:27:01.067880960 +0000
***************
*** 4284,4294 ****
dict_T *dict,
char_u *key,
char_u *attr_str,
! int len)
{
dictitem_T *di;
dict_T *attrdict;
int i;

attr_str[0] = NUL;
di = dict_find(dict, key, -1);
--- 4284,4296 ----
dict_T *dict,
char_u *key,
char_u *attr_str,
! size_t len)
{
dictitem_T *di;
dict_T *attrdict;
int i;
+ char_u *p;
+ size_t sz;

attr_str[0] = NUL;
di = dict_find(dict, key, -1);
***************
*** 4310,4329 ****
return TRUE;
}

for (i = 0; i < (int)ARRAY_LENGTH(hl_name_table); i++)
{
if (dict_get_bool(attrdict, (char_u *)hl_name_table[i],
VVAL_FALSE) == VVAL_TRUE)
{
! if (attr_str[0] != NUL)
! vim_strcat(attr_str, (char_u *)",", len);
! vim_strcat(attr_str, (char_u *)hl_name_table[i], len);
}
}

return TRUE;
}

/*
* Add or update a highlight group using 'dict' items. Returns TRUE if
* successfully updated the highlight group.
--- 4312,4369 ----
return TRUE;
}

+ p = attr_str;
for (i = 0; i < (int)ARRAY_LENGTH(hl_name_table); i++)
{
if (dict_get_bool(attrdict, (char_u *)hl_name_table[i],
VVAL_FALSE) == VVAL_TRUE)
{
! if (p != attr_str && (size_t)(p - attr_str + 2) < len)
! STRCPY(p, (char_u *)",");
! sz = STRLEN(hl_name_table[i]);
! if (p - attr_str + sz + 1 < len)
! {
! STRCPY(p, (char_u *)hl_name_table[i]);
! p += sz;
! }
}
}

return TRUE;
}

+ // Temporary buffer used to store the command string produced by hlset().
+ // IObuff cannot be used for this as the error messages produced by hlset()
+ // internally use IObuff.
+ #define HLSETBUFSZ 512
+ static char_u hlsetBuf[HLSETBUFSZ + 1];
+
+ /*
+ * Add the highlight attribute "attr" of length "attrlen" and "value" at
+ * "dptr", which points into "hlsetBuf".
+ * Returns the updated pointer.
+ */
+ static char_u *
+ add_attr_and_value(char_u *dptr, char_u *attr, int attrlen, char_u *value)
+ {
+ size_t vallen;
+
+ // Do nothing if the value is not specified or is empty
+ if (value == NULL || *value == NUL)
+ return dptr;
+
+ vallen = STRLEN(value);
+ if (dptr + attrlen + vallen + 1 < hlsetBuf + HLSETBUFSZ)
+ {
+ STRCPY(dptr, attr);
+ dptr += attrlen;
+ STRCPY(dptr, value);
+ dptr += vallen;
+ }
+
+ return dptr;
+ }
+
/*
* Add or update a highlight group using 'dict' items. Returns TRUE if
* successfully updated the highlight group.
***************
*** 4350,4358 ****
int forceit = FALSE;
int dodefault = FALSE;
int done = FALSE;

name = hldict_get_string(dict, (char_u *)"name", &error);
! if (name == NULL || error)
return FALSE;

if (dict_get_bool(dict, (char_u *)"force", VVAL_FALSE) == VVAL_TRUE)
--- 4390,4399 ----
int forceit = FALSE;
int dodefault = FALSE;
int done = FALSE;
+ char_u *p;

name = hldict_get_string(dict, (char_u *)"name", &error);
! if (name == NULL || *name == NUL || error)
return FALSE;

if (dict_get_bool(dict, (char_u *)"force", VVAL_FALSE) == VVAL_TRUE)
***************
*** 4369,4376 ****
cleared = dict_get_bool(dict, (char_u *)"cleared", FALSE);
if (cleared == TRUE)
{
! vim_snprintf((char *)IObuff, IOSIZE, "clear %s", name);
! do_highlight(IObuff, forceit, FALSE);
done = TRUE;
}
}
--- 4410,4417 ----
cleared = dict_get_bool(dict, (char_u *)"cleared", FALSE);
if (cleared == TRUE)
{
! vim_snprintf((char *)hlsetBuf, HLSETBUFSZ, "clear %s", name);
! do_highlight(hlsetBuf, forceit, FALSE);
done = TRUE;
}
}
***************
*** 4381,4392 ****

// link highlight groups
linksto = hldict_get_string(dict, (char_u *)"linksto", &error);
! if (linksto == NULL || error)
return FALSE;

! vim_snprintf((char *)IObuff, IOSIZE, "%slink %s %s",
dodefault ? "default " : "", name, linksto);
! do_highlight(IObuff, forceit, FALSE);

done = TRUE;
}
--- 4422,4433 ----

// link highlight groups
linksto = hldict_get_string(dict, (char_u *)"linksto", &error);
! if (linksto == NULL || *linksto == NUL || error)
return FALSE;

! vim_snprintf((char *)hlsetBuf, HLSETBUFSZ, "%slink %s %s",
dodefault ? "default " : "", name, linksto);
! do_highlight(hlsetBuf, forceit, FALSE);

done = TRUE;
}
***************
*** 4405,4415 ****
return FALSE;

if (!hldict_attr_to_str(dict, (char_u *)"term", term_attr,
! sizeof(term_attr)))
return FALSE;

if (!hldict_attr_to_str(dict, (char_u *)"cterm", cterm_attr,
! sizeof(cterm_attr)))
return FALSE;

ctermfg = hldict_get_string(dict, (char_u *)"ctermfg", &error);
--- 4446,4456 ----
return FALSE;

if (!hldict_attr_to_str(dict, (char_u *)"term", term_attr,
! sizeof(term_attr)))
return FALSE;

if (!hldict_attr_to_str(dict, (char_u *)"cterm", cterm_attr,
! sizeof(cterm_attr)))
return FALSE;

ctermfg = hldict_get_string(dict, (char_u *)"ctermfg", &error);
***************
*** 4424,4431 ****
if (error)
return FALSE;

! if (!hldict_attr_to_str(dict, (char_u *)"gui", gui_attr,
! sizeof(gui_attr)))
return FALSE;

guifg = hldict_get_string(dict, (char_u *)"guifg", &error);
--- 4465,4471 ----
if (error)
return FALSE;

! if (!hldict_attr_to_str(dict, (char_u *)"gui", gui_attr, sizeof(gui_attr)))
return FALSE;

guifg = hldict_get_string(dict, (char_u *)"guifg", &error);
***************
*** 4457,4497 ****
)
return TRUE;

! vim_snprintf((char *)IObuff, IOSIZE,
! "%s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s %s%s",
! dodefault ? "default " : "",
! name,
! term_attr[0] != NUL ? "term=" : "",
! term_attr[0] != NUL ? term_attr : (char_u *)"",
! start != NULL ? "start=" : "",
! start != NULL ? start : (char_u *)"",
! stop != NULL ? "stop=" : "",
! stop != NULL ? stop : (char_u *)"",
! cterm_attr[0] != NUL ? "cterm=" : "",
! cterm_attr[0] != NUL ? cterm_attr : (char_u *)"",
! ctermfg != NULL ? "ctermfg=" : "",
! ctermfg != NULL ? ctermfg : (char_u *)"",
! ctermbg != NULL ? "ctermbg=" : "",
! ctermbg != NULL ? ctermbg : (char_u *)"",
! ctermul != NULL ? "ctermul=" : "",
! ctermul != NULL ? ctermul : (char_u *)"",
! gui_attr[0] != NUL ? "gui=" : "",
! gui_attr[0] != NUL ? gui_attr : (char_u *)"",
# ifdef FEAT_GUI
! font != NULL ? "font=" : "",
! font != NULL ? font : (char_u *)"",
! # else
! "", "",
# endif
! guifg != NULL ? "guifg=" : "",
! guifg != NULL ? guifg : (char_u *)"",
! guibg != NULL ? "guibg=" : "",
! guibg != NULL ? guibg : (char_u *)"",
! guisp != NULL ? "guisp=" : "",
! guisp != NULL ? guisp : (char_u *)""
! );

! do_highlight(IObuff, forceit, FALSE);

return TRUE;
}
--- 4497,4523 ----
)
return TRUE;

! hlsetBuf[0] = NUL;
! p = hlsetBuf;
! if (dodefault)
! p = add_attr_and_value(p, (char_u *)"default", 7, (char_u *)" ");
! p = add_attr_and_value(p, (char_u *)"", 0, name);
! p = add_attr_and_value(p, (char_u *)" term=", 6, term_attr);
! p = add_attr_and_value(p, (char_u *)" start=", 7, start);
! p = add_attr_and_value(p, (char_u *)" stop=", 6, stop);
! p = add_attr_and_value(p, (char_u *)" cterm=", 7, cterm_attr);
! p = add_attr_and_value(p, (char_u *)" ctermfg=", 9, ctermfg);
! p = add_attr_and_value(p, (char_u *)" ctermbg=", 9, ctermbg);
! p = add_attr_and_value(p, (char_u *)" ctermul=", 9, ctermul);
! p = add_attr_and_value(p, (char_u *)" gui=", 5, gui_attr);
# ifdef FEAT_GUI
! p = add_attr_and_value(p, (char_u *)" font=", 6, font);
# endif
! p = add_attr_and_value(p, (char_u *)" guifg=", 7, guifg);
! p = add_attr_and_value(p, (char_u *)" guibg=", 7, guibg);
! p = add_attr_and_value(p, (char_u *)" guisp=", 7, guisp);

! do_highlight(hlsetBuf, forceit, FALSE);

return TRUE;
}
*** ../vim-8.2.3667/src/testdir/test_highlight.vim 2021-11-16 17:19:24.502463313 +0000
--- src/testdir/test_highlight.vim 2021-11-24 20:19:11.342028044 +0000
***************
*** 1228,1233 ****
--- 1228,1248 ----
highlight clear hlg10
END
call CheckLegacyAndVim9Success(lines)
+
+ " Test for empty values of attributes
+ call hlset([{'name': 'hlg11', 'cterm': {}}])
+ call hlset([{'name': 'hlg11', 'ctermfg': ''}])
+ call hlset([{'name': 'hlg11', 'ctermbg': ''}])
+ call hlset([{'name': 'hlg11', 'ctermul': ''}])
+ call hlset([{'name': 'hlg11', 'font': ''}])
+ call hlset([{'name': 'hlg11', 'gui': {}}])
+ call hlset([{'name': 'hlg11', 'guifg': ''}])
+ call hlset([{'name': 'hlg11', 'guibg': ''}])
+ call hlset([{'name': 'hlg11', 'guisp': ''}])
+ call hlset([{'name': 'hlg11', 'start': ''}])
+ call hlset([{'name': 'hlg11', 'stop': ''}])
+ call hlset([{'name': 'hlg11', 'term': {}}])
+ call assert_true(hlget('hlg11')[0].cleared)
endfunc

" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.3667/src/version.c 2021-11-24 19:55:43.016619263 +0000
--- src/version.c 2021-11-24 20:20:49.773480494 +0000
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 3668,
/**/

--
Zen Microsystems: we're the om in .commmmmmmmm

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///