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

Regex: abort compilation as soon as we hit the instruction count limit

Browse Source
This commit is contained in:
Maxime Coste 2017-10-16 19:36:06 +08:00
parent b59ad2f09d
commit 2c6c0be0c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/regex_impl.cc
View File

@ -579,9 +579,6 @@ struct RegexCompiler
{ {
compile_node(m_parsed_regex.ast); compile_node(m_parsed_regex.ast);
push_inst(CompiledRegex::Match); push_inst(CompiledRegex::Match);
constexpr auto max_instructions = std::numeric_limits<uint16_t>::max();
if (m_program.instructions.size() >= max_instructions)
throw regex_error(format("regex compiled to more than {} instructions", max_instructions));
m_program.matchers = m_parsed_regex.matchers; m_program.matchers = m_parsed_regex.matchers;
m_program.save_count = m_parsed_regex.capture_count * 2; m_program.save_count = m_parsed_regex.capture_count * 2;
m_program.direction = direction; m_program.direction = direction;
@ -756,7 +753,10 @@ private:
uint32_t push_inst(CompiledRegex::Op op, uint32_t param = 0) uint32_t push_inst(CompiledRegex::Op op, uint32_t param = 0)
{ {
constexpr auto max_instructions = std::numeric_limits<uint16_t>::max();
uint32_t res = m_program.instructions.size(); uint32_t res = m_program.instructions.size();
if (res > max_instructions)
throw regex_error(format("regex compiled to more than {} instructions", max_instructions));
m_program.instructions.push_back({ op, false, 0, param }); m_program.instructions.push_back({ op, false, 0, param });
return res; return res;
} }