mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-21 12:05:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Shell: Correct the out-of-bounds expansion bailing condition

Browse source 
Also adds a couple (useful) debug prints which helped track down the
problem.
This commit is contained in:
Ali Mohammad Pur 2023-02-16 21:37:45 +03:30 • committed by Ali Mohammad Pur
parent d56fbaa7e8
commit 99d264afbe
Notes: sideshowbarker 2024-07-17 08:25:15 +09:00
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Userland/Shell/PosixParser.cpp
View file

@ -1682,10 +1682,13 @@ RefPtr<AST::Node> Parser::parse_word()
append_bareword(string.substring_view(*run_start, string.length() - *run_start));
};
if (!token.resolved_expansions.is_empty())
dbgln_if(SHELL_POSIX_PARSER_DEBUG, "Expanding '{}' with {} expansion entries", token.value, token.resolved_expansions.size());
size_t current_offset = 0;
for (auto& expansion : token.resolved_expansions) {
expansion.visit(
[&](ResolvedParameterExpansion const& x) {
dbgln_if(SHELL_POSIX_PARSER_DEBUG, " Expanding '{}' ({}+{})", x.to_deprecated_string(), x.range.start, x.range.length);
if (x.range.start >= token.value.length()) {
dbgln("Parameter expansion range {}-{} is out of bounds for '{}'", x.range.start, x.range.length, token.value);
return;
@ -1713,7 +1716,7 @@ RefPtr<AST::Node> Parser::parse_word()
});
}
if (current_offset >= token.value.length()) {
if (current_offset > token.value.length()) {
dbgln("Parameter expansion range {}- is out of bounds for '{}'", current_offset, token.value);
return word;
}