RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:27:35 +00:00
Code Issues Activity Actions

Shell: Move the heredocs vector to a local value before processing it

Browse source 
Otherwise we would end up trying to parse the same heredoc entry, if it
contained a sequence terminated by a newline.
e.g. `<<-x\n$({` would attempt to read a heredoc entry after `x`, and
then after `{` while inside the first heredoc entry.
To make this work, we can simply empty the instance vector and keep the
state on the stack.
Issue found through oss-fuzz:
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33852
This commit is contained in:
Ali Mohammad Pur 2021-05-01 12:44:09 +04:30 • committed by Andreas Kling
parent 323a408d8c
commit 70728b49e2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Shell/Parser.cpp
View file

@ -1982,8 +1982,10 @@ RefPtr<AST::Node> Parser::parse_heredoc_initiation_record()
bool Parser::parse_heredoc_entries()
{
auto heredocs = move(m_heredoc_initiations);
m_heredoc_initiations.clear();
// Try to parse heredoc entries, as reverse recorded in the initiation records
for (auto& record : m_heredoc_initiations) {
for (auto& record : heredocs) {
auto rule_start = push_start();
if (m_rule_start_offsets.size() > max_allowed_nested_rule_depth) {
record.node->set_is_syntax_error(*create<AST::SyntaxError>(String::formatted("Expression nested too deep (max allowed is {})", max_allowed_nested_rule_depth)));
@ -2070,8 +2072,6 @@ bool Parser::parse_heredoc_entries()
record.node->set_contents(create<AST::DoubleQuotedString>(move(expr)));
}
}
m_heredoc_initiations.clear();
return true;
}