xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validate option names to be in [a-zA-Z0-9_]

Browse Source 
Closes #824
This commit is contained in:
Maxime Coste 2016-09-27 09:54:55 +01:00
parent b74a268552
commit 1b9eb2c6ba
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/option_manager.hh
View File

@ -216,13 +216,22 @@ public:
const T& value,
OptionFlags flags = OptionFlags::None)
{
auto is_not_identifier = [](char c) {
return (c < 'a' or c > 'z') and
(c < 'A' or c > 'Z') and
(c < '0' or c > '9') and c != '_';
};
if (contains_that(name, is_not_identifier))
throw runtime_error{format("name '{}' contains char out of [a-zA-Z0-9_]", name)};
auto& opts = m_global_manager.m_options;
auto it = find_option(opts, name);
if (it != opts.end())
{
if ((*it)->is_of_type<T>() and (*it)->flags() == flags)
return **it;
throw runtime_error(format("option '{}' already declared with different type or flags", name));
throw runtime_error{format("option '{}' already declared with different type or flags", name)};
}
String doc = docstring.empty() ? format("[{}]", option_type_name<T>::name())
: format("[{}] - {}", option_type_name<T>::name(), docstring);