fix(api): nvim_set_hl bail out on invalid group name (#20021)

This commit is contained in:
zeertzjq
2022-08-31 19:47:10 +08:00
committed by GitHub
parent 0903702634
commit fa747d004a
2 changed files with 11 additions and 4 deletions

View File

@@ -86,8 +86,7 @@ Dictionary nvim_get_hl_by_name(String name, Boolean rgb, Error *err)
int id = syn_name2id(name.data);
if (id == 0) {
api_set_error(err, kErrorTypeException, "Invalid highlight name: %s",
name.data);
api_set_error(err, kErrorTypeException, "Invalid highlight name: %s", name.data);
return result;
}
result = nvim_get_hl_by_id(id, rgb, err);
@@ -105,8 +104,7 @@ Dictionary nvim_get_hl_by_id(Integer hl_id, Boolean rgb, Error *err)
{
Dictionary dic = ARRAY_DICT_INIT;
if (syn_get_final_id((int)hl_id) == 0) {
api_set_error(err, kErrorTypeException,
"Invalid highlight id: %" PRId64, hl_id);
api_set_error(err, kErrorTypeException, "Invalid highlight id: %" PRId64, hl_id);
return dic;
}
int attrcode = syn_id2attr((int)hl_id);
@@ -175,6 +173,10 @@ void nvim_set_hl(Integer ns_id, String name, Dict(highlight) *val, Error *err)
FUNC_API_SINCE(7)
{
int hl_id = syn_check_group(name.data, name.size);
if (hl_id == 0) {
api_set_error(err, kErrorTypeException, "Invalid highlight name: %s", name.data);
return;
}
int link_id = -1;
HlAttrs attrs = dict2hlattrs(val, true, &link_id, err);