RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-10 03:47:34 +00:00
Code Issues Activity Actions

Shell: Do not leak the value of ARGV in nested function calls

Browse source
This commit is contained in:
AnotherTest 2020-11-01 13:29:25 +03:30 • committed by Andreas Kling
parent e87e580eb3
commit 1aed61964a
3 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Shell/Shell.cpp
View file

@ -413,18 +413,27 @@ String Shell::local_variable_or(const String& name, const String& replacement)
return replacement;
}
void Shell::set_local_variable(const String& name, RefPtr<AST::Value> value)
void Shell::set_local_variable(const String& name, RefPtr<AST::Value> value, bool only_in_current_frame)
{
if (auto* frame = find_frame_containing_local_variable(name))
frame->local_variables.set(name, move(value));
else
m_local_frames.last().local_variables.set(name, move(value));
if (!only_in_current_frame) {
if (auto* frame = find_frame_containing_local_variable(name)) {
frame->local_variables.set(name, move(value));
return;
}
}
m_local_frames.last().local_variables.set(name, move(value));
}
void Shell::unset_local_variable(const String& name)
void Shell::unset_local_variable(const String& name, bool only_in_current_frame)
{
if (auto* frame = find_frame_containing_local_variable(name))
frame->local_variables.remove(name);
if (!only_in_current_frame) {
if (auto* frame = find_frame_containing_local_variable(name))
frame->local_variables.remove(name);
return;
}
m_local_frames.last().local_variables.remove(name);
}
void Shell::define_function(String name, Vector<String> argnames, RefPtr<AST::Node> body)
@ -473,7 +482,7 @@ bool Shell::invoke_function(const AST::Command& command, int& retval)
auto argv = command.argv;
argv.take_first();
set_local_variable("ARGV", adopt(*new AST::ListValue(move(argv))));
set_local_variable("ARGV", adopt(*new AST::ListValue(move(argv))), true);
function.body->run(*this);