forked from aniani/vim
patch 8.0.0056
Problem: When setting 'filetype' there is no check for a valid name. Solution: Only allow valid characters in 'filetype', 'syntax' and 'keymap'.
This commit is contained in:
38
src/option.c
38
src/option.c
@@ -5822,6 +5822,21 @@ set_string_option(
|
||||
return r;
|
||||
}
|
||||
|
||||
/*
|
||||
* Return TRUE if "val" is a valid 'filetype' name.
|
||||
* Also used for 'syntax' and 'keymap'.
|
||||
*/
|
||||
static int
|
||||
valid_filetype(char_u *val)
|
||||
{
|
||||
char_u *s;
|
||||
|
||||
for (s = val; *s != NUL; ++s)
|
||||
if (!ASCII_ISALNUM(*s) && vim_strchr((char_u *)".-_", *s) == NULL)
|
||||
return FALSE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Handle string options that need some action to perform when changed.
|
||||
* Returns NULL for success, or an error message for an error.
|
||||
@@ -6235,8 +6250,11 @@ did_set_string_option(
|
||||
#ifdef FEAT_KEYMAP
|
||||
else if (varp == &curbuf->b_p_keymap)
|
||||
{
|
||||
/* load or unload key mapping tables */
|
||||
errmsg = keymap_init();
|
||||
if (!valid_filetype(*varp))
|
||||
errmsg = e_invarg;
|
||||
else
|
||||
/* load or unload key mapping tables */
|
||||
errmsg = keymap_init();
|
||||
|
||||
if (errmsg == NULL)
|
||||
{
|
||||
@@ -7222,6 +7240,22 @@ did_set_string_option(
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_AUTOCMD
|
||||
else if (gvarp == &p_ft)
|
||||
{
|
||||
if (!valid_filetype(*varp))
|
||||
errmsg = e_invarg;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_SYN_HL
|
||||
else if (gvarp == &p_syn)
|
||||
{
|
||||
if (!valid_filetype(*varp))
|
||||
errmsg = e_invarg;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Options that are a list of flags. */
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user